From c50bfa07ca3a456d69d73988f42e58e3282879e9 Mon Sep 17 00:00:00 2001
From: Mario Vavti <mario@mariovavti.com>
Date: Wed, 3 Aug 2016 21:16:57 +0200
Subject: multiple acl work

---
 view/tpl/attach_edit.tpl | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

(limited to 'view/tpl/attach_edit.tpl')

diff --git a/view/tpl/attach_edit.tpl b/view/tpl/attach_edit.tpl
index 965fb4819..1098049bf 100644
--- a/view/tpl/attach_edit.tpl
+++ b/view/tpl/attach_edit.tpl
@@ -1,4 +1,4 @@
-<form action="filestorage/{{$channelnick}}/{{$file.id}}/edit" method="post" >
+<form id="attach_edit_form_{{$file.id}}" action="filestorage/{{$channelnick}}/{{$file.id}}/edit" method="post" >
 	<input type="hidden" name="channelnick" value="{{$channelnick}}" />
 	<input type="hidden" name="filehash" value="{{$file.hash}}" />
 	<input type="hidden" name="uid" value="{{$uid}}" />
@@ -16,15 +16,13 @@
 		</button>
 	</div>
 	<div id="attach-edit-perms" class="btn-group pull-right">
-		<button id="dbtn-acl" class="btn btn-default btn-xs" data-toggle="modal" data-target="#aclModal" title="{{$permset}}" onclick="return false;">
+		<button id="dbtn-acl" class="acl-select btn btn-default btn-xs" data-toggle="modal" data-target="#aclModal" title="{{$permset}}" onclick="return false;" data-formid="attach_edit_form_{{$file.id}}" data-allow_cid="{{$allow_cid}}"  data-allow_gid="{{$allow_gid}}"  data-deny_cid="{{$deny_cid}}"  data-deny_gid="{{$deny_gid}}">
 			<i id="jot-perms-icon" class="fa fa-{{$lockstate}} jot-icons"></i>
 		</button>
-		<button id="dbtn-submit" class="btn btn-primary btn-xs" type="submit" name="submit">
+		<button id="dbtn-submit" class="acl-submit btn btn-primary btn-xs" type="submit" name="submit" data-formid="attach_edit_form_{{$file.id}}">
 			{{$submit}}
 		</button>
 	</div>
-	{{$aclselect}}
-
 	<div id="link-code" class="form-group">
 		<label for="">{{$cpldesc}}</label>
 		<input type="text" class="form-control" id="linkpasteinput" name="cutpasteextlink" value="{{$cloudpath}}" onclick="this.select();"/>
-- 
cgit v1.2.3


From 0340160ba71f73ef3dab1141d75f30d85144cc44 Mon Sep 17 00:00:00 2001
From: Mario Vavti <mario@mariovavti.com>
Date: Thu, 4 Aug 2016 10:36:45 +0200
Subject: multi acl: port /cloud and /filestorage

---
 view/tpl/attach_edit.tpl | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'view/tpl/attach_edit.tpl')

diff --git a/view/tpl/attach_edit.tpl b/view/tpl/attach_edit.tpl
index 1098049bf..1d58004e5 100644
--- a/view/tpl/attach_edit.tpl
+++ b/view/tpl/attach_edit.tpl
@@ -1,4 +1,4 @@
-<form id="attach_edit_form_{{$file.id}}" action="filestorage/{{$channelnick}}/{{$file.id}}/edit" method="post" >
+<form id="attach_edit_form_{{$file.id}}" action="filestorage/{{$channelnick}}/{{$file.id}}/edit" method="post" class="acl-form" data-form_id="attach_edit_form_{{$file.id}}" data-allow_cid='{{$allow_cid}}' data-allow_gid='{{$allow_gid}}' data-deny_cid='{{$deny_cid}}' data-deny_gid='{{$deny_gid}}'>
 	<input type="hidden" name="channelnick" value="{{$channelnick}}" />
 	<input type="hidden" name="filehash" value="{{$file.hash}}" />
 	<input type="hidden" name="uid" value="{{$uid}}" />
@@ -16,10 +16,10 @@
 		</button>
 	</div>
 	<div id="attach-edit-perms" class="btn-group pull-right">
-		<button id="dbtn-acl" class="acl-select btn btn-default btn-xs" data-toggle="modal" data-target="#aclModal" title="{{$permset}}" onclick="return false;" data-formid="attach_edit_form_{{$file.id}}" data-allow_cid="{{$allow_cid}}"  data-allow_gid="{{$allow_gid}}"  data-deny_cid="{{$deny_cid}}"  data-deny_gid="{{$deny_gid}}">
+		<button id="dbtn-acl" class="btn btn-default btn-xs" data-toggle="modal" data-target="#aclModal" title="{{$permset}}" type="button">
 			<i id="jot-perms-icon" class="fa fa-{{$lockstate}} jot-icons"></i>
 		</button>
-		<button id="dbtn-submit" class="acl-submit btn btn-primary btn-xs" type="submit" name="submit" data-formid="attach_edit_form_{{$file.id}}">
+		<button id="dbtn-submit" class="btn btn-primary btn-xs" type="submit" name="submit">
 			{{$submit}}
 		</button>
 	</div>
-- 
cgit v1.2.3