From 4050ff7c1f5a1acd34f58af3d41d12be49331ac7 Mon Sep 17 00:00:00 2001
From: Mario Vavti <mario@mariovavti.com>
Date: Mon, 29 Aug 2016 12:48:16 +0200
Subject: make lock switching actually work with multiple acl forms

---
 view/js/acl.js                  | 12 ++++++------
 view/tpl/cloud_actionspanel.tpl |  1 -
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/view/js/acl.js b/view/js/acl.js
index c1685e137..c11997c43 100644
--- a/view/js/acl.js
+++ b/view/js/acl.js
@@ -68,7 +68,7 @@ function ACL(backend_url) {
 }
 
 
-ACL.prototype.get_form_data = function(event) { 
+ACL.prototype.get_form_data = function(event) {
 
 		form_id = $(this).data('form_id');
 		that.form_id = $('#' + form_id);
@@ -275,7 +275,7 @@ ACL.prototype.update_view = function(value) {
 		that.update_select('public');
 
 		/* jot acl */
-		$('#jot-perms-icon, #dialog-perms-icon').removeClass('fa-lock').addClass('fa-unlock');
+		$('#jot-perms-icon, #dialog-perms-icon, #' + that.form_id[0].id + ' .jot-perms-icon').removeClass('fa-lock').addClass('fa-unlock');
 		$('#dbtn-jotnets').show();
 		$('.profile-jot-net input').attr('disabled', false);
 
@@ -288,7 +288,7 @@ ACL.prototype.update_view = function(value) {
 		that.update_select(that.selected_id);
 
 		/* jot acl */
-		$('#jot-perms-icon, #dialog-perms-icon').removeClass('fa-unlock').addClass('fa-lock');
+		$('#jot-perms-icon, #dialog-perms-icon, #' + that.form_id[0].id + ' .jot-perms-icon').removeClass('fa-unlock').addClass('fa-lock');
 		$('#dbtn-jotnets').hide();
 		$('.profile-jot-net input').attr('disabled', 'disabled');
 	}
@@ -300,7 +300,7 @@ ACL.prototype.update_view = function(value) {
 		that.update_select('onlyme');
 
 		/* jot acl */
-		$('#jot-perms-icon, #dialog-perms-icon').removeClass('fa-unlock').addClass('fa-lock');
+		$('#jot-perms-icon, #dialog-perms-icon, #' + that.form_id[0].id + ' .jot-perms-icon').removeClass('fa-unlock').addClass('fa-lock');
 		$('#dbtn-jotnets').hide();
 		$('.profile-jot-net input').attr('disabled', 'disabled');
 	}
@@ -312,12 +312,12 @@ ACL.prototype.update_view = function(value) {
 
 		/* jot acl */
 		if(that.allow_gid.length === 0 && that.allow_cid.length === 0 && that.deny_gid.length === 0 && that.deny_cid.length === 0 && value === 'custom') {
-			$('#jot-perms-icon, #dialog-perms-icon').removeClass('fa-lock').addClass('fa-unlock');
+			$('#jot-perms-icon, #dialog-perms-icon, #' + that.form_id[0].id + ' .jot-perms-icon').removeClass('fa-lock').addClass('fa-unlock');
 			$('#dbtn-jotnets').show();
 			$('.profile-jot-net input').attr('disabled', false);
 		}
 		else {
-			$('#jot-perms-icon, #dialog-perms-icon').removeClass('fa-unlock').addClass('fa-lock');
+			$('#jot-perms-icon, #dialog-perms-icon, #' + that.form_id[0].id + ' .jot-perms-icon').removeClass('fa-unlock').addClass('fa-lock');
 			$('#dbtn-jotnets').hide();
 			$('.profile-jot-net input').attr('disabled', 'disabled');
 		}
diff --git a/view/tpl/cloud_actionspanel.tpl b/view/tpl/cloud_actionspanel.tpl
index b851e391e..36edc3b44 100644
--- a/view/tpl/cloud_actionspanel.tpl
+++ b/view/tpl/cloud_actionspanel.tpl
@@ -1,7 +1,6 @@
 <div id="files-mkdir-tools" class="section-content-tools-wrapper">
 	<label for="files-mkdir">{{$folder_header}}</label>
 	<form id="mkdir-form" method="post" action="file_upload" class="acl-form" data-form_id="mkdir-form" data-allow_cid='{{$allow_cid}}' data-allow_gid='{{$allow_gid}}' data-deny_cid='{{$deny_cid}}' data-deny_gid='{{$deny_gid}}'>
-		<!--input type="hidden" name="sabreAction" value="mkcol"-->
 		<input type="hidden" name="folder" value="{{$folder}}" />
 		<input type="hidden" name="channick" value="{{$channick}}" />
 		<input type="hidden" name="return_url" value="{{$return_url}}" />
-- 
cgit v1.2.3