better handling of the display of conflicting group permissions

1 files changed, 8 insertions, 2 deletions

diff --git a/js/acl.js b/js/acl.js
index bd9f71082..e383224ca 100644
--- a/js/acl.js
+++ b/js/acl.js
@@ -200,8 +200,14 @@ ACL.prototype.update_view = function(){
 				$(that.group_uids[id]).each(function(i,v) {
 					if(uclass == "grouphide")
 						$("#c"+v).removeClass("groupshow");
-					if(uclass != "")
-						$("#c"+v).addClass(uclass);
+					if(uclass != "") {
+						var cls = $("#c"+v).attr('class');
+						if( cls == undefined)
+							return true;
+						var hiding = cls.indexOf('grouphide');
+						if(hiding == -1)
+							$("#c"+v).addClass(uclass);
+					}
 				});
 				
 				break;