From: Matthias Schmidt <gravatronics@live.com>
Date: Sun, 5 Oct 2014 09:36:23 +0000 (+0200)
Subject: Use unique IDs in WCF.ACL.List for grantAll and denyAll
X-Git-Tag: 2.1.0_Alpha_1~273
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=902c8112693315652e7ed282000ecace0a4a07b6;p=GitHub%2FWoltLab%2FWCF.git

Use unique IDs in WCF.ACL.List for grantAll and denyAll
---

diff --git a/wcfsetup/install/files/js/WCF.ACL.js b/wcfsetup/install/files/js/WCF.ACL.js
index bea2a0719c..45c3b3a69c 100644
--- a/wcfsetup/install/files/js/WCF.ACL.js
+++ b/wcfsetup/install/files/js/WCF.ACL.js
@@ -287,8 +287,8 @@ WCF.ACL.List = Class.extend({
 		// add a "full access" permission if there are more than one option
 		if ($count > 1) {
 			var $listItem = $('<li class="aclFullAccess"><span>' + WCF.Language.get('wcf.acl.option.fullAccess') + '</span></li>').prependTo(this._containerElements.permissionList);
-			this._containerElements.grantAll = $('<input type="checkbox" id="grantAll" />').appendTo($listItem).wrap('<label class="jsTooltip" title="' + WCF.Language.get('wcf.acl.option.grant') + '" />');
-			this._containerElements.denyAll = $('<input type="checkbox" id="denyAll" />').appendTo($listItem).wrap('<label class="jsTooltip" title="' + WCF.Language.get('wcf.acl.option.deny') + '" />');
+			this._containerElements.grantAll = $('<input type="checkbox" id="grantAll_' + this._container.attr('id') + '" />').appendTo($listItem).wrap('<label class="jsTooltip" title="' + WCF.Language.get('wcf.acl.option.grant') + '" />');
+			this._containerElements.denyAll = $('<input type="checkbox" id="denyAll_' + this._container.attr('id') + '" />').appendTo($listItem).wrap('<label class="jsTooltip" title="' + WCF.Language.get('wcf.acl.option.deny') + '" />');
 			
 			// bind events
 			this._containerElements.grantAll.data('type', 'grant').change($.proxy(this._changeAll, this));
@@ -414,16 +414,16 @@ WCF.ACL.List = Class.extend({
 		}
 		
 		var $allChecked = true;
-		this._containerElements.permissionList.find('input[type=checkbox]').each(function(index, item) {
+		this._containerElements.permissionList.find('input[type=checkbox]').each($.proxy(function(index, item) {
 			var $item = $(item);
 			
-			if ($item.data('type') === $type && $item.attr('id') !== $type + 'All') {
+			if ($item.data('type') === $type && $item.attr('id') !== $type + 'All_' + this._container.attr('id')) {
 				if (!$item.is(':checked')) {
 					$allChecked = false;
 					return false;
 				}
 			}
-		});
+		}, this));
 		if ($type == 'deny') {
 			if (this._containerElements.denyAll !== null) {
 				if ($allChecked) this._containerElements.denyAll.prop('checked', true);
@@ -451,48 +451,48 @@ WCF.ACL.List = Class.extend({
 			if ($type === 'deny') {
 				this._containerElements.grantAll.prop('checked', false);
 				
-				this._containerElements.permissionList.find('input[type=checkbox]').each(function(index, item) {
+				this._containerElements.permissionList.find('input[type=checkbox]').each($.proxy(function(index, item) {
 					var $item = $(item);
 					
-					if ($item.data('type') === 'deny' && $item.attr('id') !== 'denyAll') {
+					if ($item.data('type') === 'deny' && $item.attr('id') !== 'denyAll_' + this._container.attr('id')) {
 						$item.prop('checked', true).trigger('change');
 					}
-				});
+				}, this));
 			}
 			else {
 				this._containerElements.denyAll.prop('checked', false);
 				
-				this._containerElements.permissionList.find('input[type=checkbox]').each(function(index, item) {
+				this._containerElements.permissionList.find('input[type=checkbox]').each($.proxy(function(index, item) {
 					var $item = $(item);
 					
-					if ($item.data('type') === 'grant' && $item.attr('id') !== 'grantAll') {
+					if ($item.data('type') === 'grant' && $item.attr('id') !== 'grantAll_' + this._container.attr('id')) {
 						$item.prop('checked', true).trigger('change');
 					}
-				});
+				}, this));
 			}
 		}
 		else {
 			if ($type === 'deny') {
 				this._containerElements.grantAll.prop('checked', false);
 				
-				this._containerElements.permissionList.find('input[type=checkbox]').each(function(index, item) {
+				this._containerElements.permissionList.find('input[type=checkbox]').each($.proxy(function(index, item) {
 					var $item = $(item);
 					
-					if ($item.data('type') === 'deny' && $item.attr('id') !== 'denyAll') {
+					if ($item.data('type') === 'deny' && $item.attr('id') !== 'denyAll_' + this._container.attr('id')) {
 						$item.prop('checked', false).trigger('change');
 					}
-				});
+				}, this));
 			}
 			else {
 				this._containerElements.denyAll.prop('checked', false);
 				
-				this._containerElements.permissionList.find('input[type=checkbox]').each(function(index, item) {
+				this._containerElements.permissionList.find('input[type=checkbox]').each($.proxy(function(index, item) {
 					var $item = $(item);
 					
-					if ($item.data('type') === 'grant' && $item.attr('id') !== 'grantAll') {
+					if ($item.data('type') === 'grant' && $item.attr('id') !== 'grantAll_' + this._container.attr('id')) {
 						$item.prop('checked', false).trigger('change');
 					}
-				});
+				}, this));
 			}
 		}
 	},
@@ -542,7 +542,7 @@ WCF.ACL.List = Class.extend({
 		var self = this;
 		this._containerElements.permissionList.find("input[type='checkbox']").each(function(index, checkbox) {
 			var $checkbox = $(checkbox);
-			if ($checkbox.attr('id') != 'grantAll' && $checkbox.attr('id') != 'denyAll') {
+			if ($checkbox.attr('id') != 'grantAll_' + this._container.attr('id') && $checkbox.attr('id') != 'denyAll_' + this._container.attr('id')) {
 				var $optionValue = ($checkbox.data('type') === 'deny') ? 0 : 1;
 				var $optionID = $checkbox.data('optionID');