jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/383143 )
Change subject: Fix for template permission display
......................................................................
Fix for template permission display
Permission template would appear as "checked" even if not all permissions
in it are set explicitly
ERM: #7599
Needs cherry picking to REL1_27
Change-Id: I90bf80fdc81ffe28aecc8ca63288307d1f899e7b
---
M PermissionManager/resources/BS.PermissionManager/data/Manager.js
1 file changed, 14 insertions(+), 4 deletions(-)
Approvals:
Robert Vogel: Looks good to me, approved
jenkins-bot: Verified
diff --git a/PermissionManager/resources/BS.PermissionManager/data/Manager.js
b/PermissionManager/resources/BS.PermissionManager/data/Manager.js
index 2ffc8cf..29edaec 100644
--- a/PermissionManager/resources/BS.PermissionManager/data/Manager.js
+++ b/PermissionManager/resources/BS.PermissionManager/data/Manager.js
@@ -325,12 +325,17 @@
if ( ruleSet === null ) {
return NOT_ALLOWED;
}
+
+ var result = ALLOWED_EXPLICIT;
for ( var i = 0, setlen = ruleSet.length; i < setlen; i++ ) {
- if ( checkPermission( ruleSet[i] ) === NOT_ALLOWED ) {
+ var singleResult = checkPermission( ruleSet[i] );
+ if ( singleResult === NOT_ALLOWED ) {
return NOT_ALLOWED;
+ } else if( singleResult === ALLOWED_IMPLICIT ) {
+ result = ALLOWED_IMPLICIT;
}
}
- return ALLOWED_EXPLICIT;
+ return result;
}
/**
@@ -345,12 +350,17 @@
if (checkTemplate(ruleSet) === NOT_ALLOWED) {
return NOT_ALLOWED;
}
+
+ var result = ALLOWED_EXPLICIT;
for (var i = 0, setlen = ruleSet.length; i < setlen; i++) {
- if (checkPermissionInNamespace(ruleSet[i], namespace)
=== NOT_ALLOWED) {
+ var singleResult = checkPermissionInNamespace(
ruleSet[i], namespace );
+ if ( singleResult === NOT_ALLOWED ) {
return NOT_ALLOWED;
+ } else if( singleResult === ALLOWED_IMPLICIT ) {
+ result = ALLOWED_IMPLICIT;
}
}
- return ALLOWED_EXPLICIT;
+ return result;
}
/**
--
To view, visit https://gerrit.wikimedia.org/r/383143
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I90bf80fdc81ffe28aecc8ca63288307d1f899e7b
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceExtensions
Gerrit-Branch: REL1_27_dev
Gerrit-Owner: Robert Vogel <vo...@hallowelt.biz>
Gerrit-Reviewer: ItSpiderman <d.savulje...@gmail.com>
Gerrit-Reviewer: Robert Vogel <vo...@hallowelt.biz>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
