From bb6b98ffbb0294be06f0cfe407fe85b2948a979d Mon Sep 17 00:00:00 2001
From: srosse <none@none>
Date: Tue, 16 Oct 2012 13:21:53 +0200
Subject: [PATCH] OO-376: make the visibility of administrative user properties
in user search configurable
---
.../org/olat/admin/securitygroup/gui/GroupController.java | 5 ++++-
.../org/olat/course/member/_i18n/LocalStrings_fr.properties | 4 ++--
2 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/src/main/java/org/olat/admin/securitygroup/gui/GroupController.java b/src/main/java/org/olat/admin/securitygroup/gui/GroupController.java
index eb28a589978..76ecb610162 100644
--- a/src/main/java/org/olat/admin/securitygroup/gui/GroupController.java
+++ b/src/main/java/org/olat/admin/securitygroup/gui/GroupController.java
@@ -32,9 +32,11 @@ import org.olat.admin.securitygroup.gui.multi.UsersToGroupWizardController;
import org.olat.admin.user.UserSearchController;
import org.olat.basesecurity.BaseSecurity;
import org.olat.basesecurity.BaseSecurityManager;
+import org.olat.basesecurity.BaseSecurityModule;
import org.olat.basesecurity.SecurityGroup;
import org.olat.basesecurity.events.MultiIdentityChosenEvent;
import org.olat.basesecurity.events.SingleIdentityChosenEvent;
+import org.olat.core.CoreSpringFactory;
import org.olat.core.commons.fullWebApp.popup.BaseFullWebappPopupLayoutFactory;
import org.olat.core.gui.UserRequest;
import org.olat.core.gui.components.Component;
@@ -151,7 +153,8 @@ public class GroupController extends BasicController {
this.keepAtLeastOne = keepAtLeastOne;
this.securityManager = BaseSecurityManager.getInstance();
Roles roles = ureq.getUserSession().getRoles();
- isAdministrativeUser = (roles.isAuthor() || roles.isGroupManager() || roles.isUserManager() || roles.isOLATAdmin());
+ BaseSecurityModule securityModule = CoreSpringFactory.getImpl(BaseSecurityModule.class);
+ isAdministrativeUser = securityModule.isUserAllowedAdminProps(roles);
// default group controller has no mail functionality
this.addUserMailDefaultTempl = null;
diff --git a/src/main/java/org/olat/course/member/_i18n/LocalStrings_fr.properties b/src/main/java/org/olat/course/member/_i18n/LocalStrings_fr.properties
index 05e6ba5a4ff..50bb12c39bb 100644
--- a/src/main/java/org/olat/course/member/_i18n/LocalStrings_fr.properties
+++ b/src/main/java/org/olat/course/member/_i18n/LocalStrings_fr.properties
@@ -3,7 +3,7 @@ menu.members=Membres
menu.members.alt=Administration des membres du cours
menu.groups=Groupes
menu.groups.alt=Administration des groupes
-menu.orders=Réservations
+menu.orders=R\u00E9servations
menu.orders.alt=Administration des r\u00E9servations
menu.rights=Droits
menu.rights.alt=Administration des droits du cours
@@ -28,7 +28,7 @@ table.header.firstName=Pr\u00E9nom
table.header.lastName=Nom
table.header.firstTime=Admission
table.header.lastTime=Derni\u00E8re visite
-table.header.role=R\u00D4les
+table.header.role=R\u00F4les
table.header.groups=Groupes
select.group=S\u00E9lectionner des groupes
nomembers.nogroup=Aucun membre correspondant \u00E0 vos crit\u00E8res n'a \u00E9t\u00E9 trouv\u00E9.
--
GitLab