Fix Root Group management issues.

pydio · Nov 26, 2015 · de81b04 · de81b04
1 parent ced1fdf
commit de81b04
Show file tree

Hide file tree

Showing 13 changed files with 29 additions and 5 deletions.
diff --git a/core/src/plugins/access.ajxp_conf/class.ajxp_confAccessDriver.php b/core/src/plugins/access.ajxp_conf/class.ajxp_confAccessDriver.php
@@ -2405,12 +2405,13 @@ public function listRoles($root, $child, $hashValue = null, $returnNodes = false
             <column messageId="ajxp_conf.62" attributeName="rights_summary" sortType="String"/>
             </columns>');
         if(!AuthService::usersEnabled()) return array();
+        $currentUserIsGroupAdmin = (AuthService::getLoggedUser() != null && AuthService::getLoggedUser()->getGroupPath() != "/");
         $roles = AuthService::getRolesList(array(), !$this->listSpecialRoles);
         ksort($roles);
-        if(!$this->listSpecialRoles && !$this->getName() == "ajxp_admin"){
+        $mess = ConfService::getMessages();
+        if(!$this->listSpecialRoles && $this->getName() != "ajxp_admin" && !$currentUserIsGroupAdmin){
             $rootGroupRole = AuthService::getRole("AJXP_GRP_/", true);
             if($rootGroupRole->getLabel() == "AJXP_GRP_/"){
-                $mess = ConfService::getMessages();
                 $rootGroupRole->setLabel($mess["ajxp_conf.151"]);
                 AuthService::updateRole($rootGroupRole);
             }
@@ -2431,10 +2432,14 @@ public function listRoles($root, $child, $hashValue = null, $returnNodes = false
             }
             $rightsString = implode(", ", $r);
             $nodeKey = "/data/roles/".$roleObject->getId();
+            $appliesToDefault = implode(",", $roleObject->listAutoApplies());
+            if($roleObject->getId() == "AJXP_GRP_/"){
+                $appliesToDefault = $mess["ajxp_conf.153"];
+            }
             $meta = array(
                 "icon" => "user-acl.png",
                 "rights_summary" => $rightsString,
-                "is_default"    => implode(",", $roleObject->listAutoApplies()), //($roleObject->autoAppliesTo("standard") ? $mess[440]:$mess[441]),
+                "is_default"    => $appliesToDefault, //($roleObject->autoAppliesTo("standard") ? $mess[440]:$mess[441]),
                 "ajxp_mime" => "role",
                 "role_id"   => $roleObject->getId(),
                 "text"      => $roleObject->getLabel()

diff --git a/core/src/plugins/access.ajxp_conf/i18n/de.php b/core/src/plugins/access.ajxp_conf/i18n/de.php
@@ -175,4 +175,5 @@
 "150" => "Eine Arbeitsumgebung auswählen",
 "151" => "Root Group",
 "152" => "Root Group Role",
+"153" => "Applies to the whole hierarchy of users",
 );
diff --git a/core/src/plugins/access.ajxp_conf/i18n/en.php b/core/src/plugins/access.ajxp_conf/i18n/en.php
@@ -174,4 +174,5 @@
 "150" => "Select a repository",
 "151" => "Root Group",
 "152" => "Root Group Role",
+"153" => "Applies to the whole hierarchy of users",
 );
diff --git a/core/src/plugins/access.ajxp_conf/i18n/es.php b/core/src/plugins/access.ajxp_conf/i18n/es.php
@@ -174,4 +174,6 @@
     "150" => "Select a repository",
     "151" => "Root Group",
     "152" => "Root Group Role",
+    "153" => "Applies to the whole hierarchy of users",
+
 );
diff --git a/core/src/plugins/access.ajxp_conf/i18n/fi.php b/core/src/plugins/access.ajxp_conf/i18n/fi.php
@@ -177,5 +177,6 @@
     "150" => "Select a repository",
     "151" => "Root Group",
     "152" => "Root Group Role",
+    "153" => "Applies to the whole hierarchy of users",
 /* END SENTENCE */
 );
diff --git a/core/src/plugins/access.ajxp_conf/i18n/fr.php b/core/src/plugins/access.ajxp_conf/i18n/fr.php
@@ -174,4 +174,6 @@
     "150" => "Select a repository",
     "151" => "Groupe Racine",
     "152" => "Role du groupe racine",
+    "153" => "S'applique à toute la hiérarchie des utilisateurs",
+
 );
diff --git a/core/src/plugins/access.ajxp_conf/i18n/hu.php b/core/src/plugins/access.ajxp_conf/i18n/hu.php
@@ -176,5 +176,6 @@
     "150" => "Select a repository",
     "151" => "Root Group",
     "152" => "Root Group Role",
-/* END SENTENCE */
+    "153" => "Applies to the whole hierarchy of users",
+    /* END SENTENCE */
 );
diff --git a/core/src/plugins/access.ajxp_conf/i18n/it.php b/core/src/plugins/access.ajxp_conf/i18n/it.php
@@ -174,4 +174,6 @@
 "150" => "Seleziona un repository",
     "151" => "Root Group",
     "152" => "Root Group Role",
+    "153" => "Applies to the whole hierarchy of users",
+
 );
diff --git a/core/src/plugins/access.ajxp_conf/i18n/nl.php b/core/src/plugins/access.ajxp_conf/i18n/nl.php
@@ -174,5 +174,7 @@
     "150" => "Select a repository",
     "151" => "Root Group",
     "152" => "Root Group Role",
+    "153" => "Applies to the whole hierarchy of users",
+
 );
 
diff --git a/core/src/plugins/access.ajxp_conf/i18n/pt.php b/core/src/plugins/access.ajxp_conf/i18n/pt.php
@@ -174,4 +174,6 @@
     "150" => "Select a repository",
     "151" => "Root Group",
     "152" => "Root Group Role",
+    "153" => "Applies to the whole hierarchy of users",
+
 );
diff --git a/core/src/plugins/access.ajxp_conf/i18n/ru.php b/core/src/plugins/access.ajxp_conf/i18n/ru.php
@@ -174,4 +174,5 @@
     "150" => "Select a repository",
     "151" => "Root Group",
     "152" => "Root Group Role",
+    "153" => "Applies to the whole hierarchy of users",
 );
diff --git a/core/src/plugins/access.ajxp_conf/i18n/si.php b/core/src/plugins/access.ajxp_conf/i18n/si.php
@@ -175,4 +175,5 @@
     "150" => "Select a repository",
     "151" => "Root Group",
     "152" => "Root Group Role",
+    "153" => "Applies to the whole hierarchy of users",
 );
diff --git a/core/src/plugins/editor.ajxp_role/class.RoleEditor.js b/core/src/plugins/editor.ajxp_role/class.RoleEditor.js
@@ -146,7 +146,7 @@ Class.create("RoleEditor", AbstractEditor, {
             this.roleData.USER.PROFILE = this.element.down("#account_infos").down("select[name='profile']").getValue();
             this.roleData.USER.ROLES = this.element.down("#account_infos").down("select[name='roles']").getValue();
             fullPostData["USER"] = this.roleData.USER;
-        }else if(this.roleData.GROUP){
+        }else if(this.roleData.GROUP && this.element.down("#account_infos").down("input[name='groupLabel']")){
             this.roleData.GROUP.LABEL = this.element.down("#account_infos").down("input[name='groupLabel']").getValue();
             fullPostData["GROUP_LABEL"] = this.roleData.GROUP.LABEL;
         }
@@ -417,6 +417,9 @@ Class.create("RoleEditor", AbstractEditor, {
                 this.roleWrite.APPLIES = appliesSelect.getValue();
             }.bind(this) );
             new Chosen(appliesSelect, {placeholder_text_multiple:MessageHash["ajxp_role_editor.43"]});
+            if(getBaseName(node.getPath()) == "AJXP_GRP_"){
+                this.element.down("#pane-infos").down("#account_infos").down('div.SF_element.form-element-applies').setStyle({display:'none'});
+            }
 
         }else if(scope == "group"){
             // MAIN INFO