From fd5beff7b3a4a78ef2c1294861bc7093035c2185 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=B4me=20Chilliet?= <come@opensides.be>
Date: Tue, 13 Aug 2019 11:43:27 +0200
Subject: [PATCH] :sparkles: feat(core) Sort groups and roles shown on user tab
issue #5785
---
plugins/personal/roles/class_userRoles.inc | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/plugins/personal/roles/class_userRoles.inc b/plugins/personal/roles/class_userRoles.inc
index 1b19094c0..1b39b4b6c 100644
--- a/plugins/personal/roles/class_userRoles.inc
+++ b/plugins/personal/roles/class_userRoles.inc
@@ -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 */
$groups = array_merge($myGroups, $groups);
+ asort($groups);
+ asort($myGroups);
$this->attributesAccess['groupsMembership']->attribute->setChoices(array_keys($groups), array_values($groups));
$this->attributesAccess['groupsMembership']->setValue(array_keys($myGroups));
@@ -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 */
$roles = array_merge($myRoles, $roles);
+ asort($roles);
+ asort($myRoles);
$this->attributesAccess['rolesMembership']->attribute->setChoices(array_keys($roles), array_values($roles));
$this->attributesAccess['rolesMembership']->setValue(array_keys($myRoles));
@@ -354,6 +358,8 @@ class userRoles extends simplePlugin
$myGroups = array_combine($this->attrs['userGroups'], $this->attrs['userGroups']);
$groups = $this->attributesAccess['groupsMembership']->attribute->getDisplayChoices();
$groups = array_merge($myGroups, $groups);
+ asort($groups);
+ asort($myGroups);
$this->attributesAccess['groupsMembership']->attribute->setChoices(array_keys($groups), array_values($groups));
$this->attributesAccess['groupsMembership']->setValue(array_keys($myGroups));
$this->templateGroups = array_keys($myGroups);
@@ -367,6 +373,8 @@ class userRoles extends simplePlugin
$myRoles = array_combine($this->attrs['userRoles'], $this->attrs['userRoles']);
$roles = $this->attributesAccess['rolesMembership']->attribute->getDisplayChoices();
$roles = array_merge($myRoles, $roles);
+ asort($roles);
+ asort($myRoles);
$this->attributesAccess['rolesMembership']->attribute->setChoices(array_keys($roles), array_values($roles));
$this->attributesAccess['rolesMembership']->setValue(array_keys($myRoles));
$this->templateRoles = array_keys($myRoles);
--
GitLab