Unverified Commit fd5beff7 authored by Côme Chilliet's avatar Côme Chilliet
Browse files

:sparkles: feat(core) Sort groups and roles shown on user tab

issue #5785
Showing with 8 additions and 0 deletions
+8 -0
...@@ -109,6 +109,8 @@ class userRoles extends simplePlugin ...@@ -109,6 +109,8 @@ class userRoles extends simplePlugin
} }
/* We might be in some groups we have no read ACL on, so merge them in the choices */ /* We might be in some groups we have no read ACL on, so merge them in the choices */
$groups = array_merge($myGroups, $groups); $groups = array_merge($myGroups, $groups);
asort($groups);
asort($myGroups);
$this->attributesAccess['groupsMembership']->attribute->setChoices(array_keys($groups), array_values($groups)); $this->attributesAccess['groupsMembership']->attribute->setChoices(array_keys($groups), array_values($groups));
$this->attributesAccess['groupsMembership']->setValue(array_keys($myGroups)); $this->attributesAccess['groupsMembership']->setValue(array_keys($myGroups));
...@@ -146,6 +148,8 @@ class userRoles extends simplePlugin ...@@ -146,6 +148,8 @@ class userRoles extends simplePlugin
} }
/* We might be in some roles we have no read ACL on, so merge them in the choices */ /* We might be in some roles we have no read ACL on, so merge them in the choices */
$roles = array_merge($myRoles, $roles); $roles = array_merge($myRoles, $roles);
asort($roles);
asort($myRoles);
$this->attributesAccess['rolesMembership']->attribute->setChoices(array_keys($roles), array_values($roles)); $this->attributesAccess['rolesMembership']->attribute->setChoices(array_keys($roles), array_values($roles));
$this->attributesAccess['rolesMembership']->setValue(array_keys($myRoles)); $this->attributesAccess['rolesMembership']->setValue(array_keys($myRoles));
...@@ -354,6 +358,8 @@ class userRoles extends simplePlugin ...@@ -354,6 +358,8 @@ class userRoles extends simplePlugin
$myGroups = array_combine($this->attrs['userGroups'], $this->attrs['userGroups']); $myGroups = array_combine($this->attrs['userGroups'], $this->attrs['userGroups']);
$groups = $this->attributesAccess['groupsMembership']->attribute->getDisplayChoices(); $groups = $this->attributesAccess['groupsMembership']->attribute->getDisplayChoices();
$groups = array_merge($myGroups, $groups); $groups = array_merge($myGroups, $groups);
asort($groups);
asort($myGroups);
$this->attributesAccess['groupsMembership']->attribute->setChoices(array_keys($groups), array_values($groups)); $this->attributesAccess['groupsMembership']->attribute->setChoices(array_keys($groups), array_values($groups));
$this->attributesAccess['groupsMembership']->setValue(array_keys($myGroups)); $this->attributesAccess['groupsMembership']->setValue(array_keys($myGroups));
$this->templateGroups = array_keys($myGroups); $this->templateGroups = array_keys($myGroups);
...@@ -367,6 +373,8 @@ class userRoles extends simplePlugin ...@@ -367,6 +373,8 @@ class userRoles extends simplePlugin
$myRoles = array_combine($this->attrs['userRoles'], $this->attrs['userRoles']); $myRoles = array_combine($this->attrs['userRoles'], $this->attrs['userRoles']);
$roles = $this->attributesAccess['rolesMembership']->attribute->getDisplayChoices(); $roles = $this->attributesAccess['rolesMembership']->attribute->getDisplayChoices();
$roles = array_merge($myRoles, $roles); $roles = array_merge($myRoles, $roles);
asort($roles);
asort($myRoles);
$this->attributesAccess['rolesMembership']->attribute->setChoices(array_keys($roles), array_values($roles)); $this->attributesAccess['rolesMembership']->attribute->setChoices(array_keys($roles), array_values($roles));
$this->attributesAccess['rolesMembership']->setValue(array_keys($myRoles)); $this->attributesAccess['rolesMembership']->setValue(array_keys($myRoles));
$this->templateRoles = array_keys($myRoles); $this->templateRoles = array_keys($myRoles);
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment