Skip to content
GitLab
Explore
Projects
Groups
Topics
Snippets
Projects
Groups
Topics
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
fusiondirectory
fusiondirectory
Commits
fd5beff7
Unverified
Commit
fd5beff7
authored
5 years ago
by
Côme Chilliet
Browse files
Options
Download
Patches
Plain Diff
feat(core) Sort groups and roles shown on user tab
issue #5785
parent
7276f82f
dev
6342-update-the-locales-for-1-5
6344-template-issue-when-creating-a-template-with-empty-password-error-message-should-not-be-seen
6365-core-locking-mechanism-is-not-changing-the-mail-ressource-it-does-lock-the-mail-account
6365-core-when-lock-mechanism-is-trigger-the-user-should-not-be-editable-if-not-unlock
6378-orcid-test-method-is-wrong-and-break-orcid-saving
6388-clear-the-tokens-storage-issues-into-the-fusiondirectory-configuration-backend
core-php8
master
fusiondirectory-1.5
fusiondirectory-1.4
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
plugins/personal/roles/class_userRoles.inc
+8
-0
plugins/personal/roles/class_userRoles.inc
with
8 additions
and
0 deletions
+8
-0
plugins/personal/roles/class_userRoles.inc
+
8
−
0
View file @
fd5beff7
...
@@ -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
);
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment
Menu
Explore
Projects
Groups
Topics
Snippets