Changed visibility of 'Switch user' to allow OU administrator to use it.

alkacon · Mar 24, 2017 · 501ff78 · 501ff78
1 parent d18516b
commit 501ff78
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 12 deletions.
diff --git a/src-modules/org/opencms/workplace/tools/accounts/CmsAccountsToolHandler.java b/src-modules/org/opencms/workplace/tools/accounts/CmsAccountsToolHandler.java
@@ -333,14 +333,13 @@ public boolean isVisible(CmsWorkplace wp) {
         } else if (getLink().equals(getPath(OUROLES_FILE))) {
             return !m_webuserOu;
         } else if (getLink().equals(getPath(SWITCHUSER_FILE))) {
-            boolean visible = OpenCms.getRoleManager().hasRole(cms, CmsRole.ROOT_ADMIN);
+            boolean visible = false;
             CmsUUID userId = new CmsUUID(
                 CmsRequestUtil.getNotEmptyDecodedParameter(wp.getJsp().getRequest(), A_CmsEditUserDialog.PARAM_USERID));
             try {
-                visible &= OpenCms.getRoleManager().hasRole(
-                    cms,
-                    cms.readUser(userId).getName(),
-                    CmsRole.ELEMENT_AUTHOR);
+                CmsUser user = cms.readUser(userId);
+                visible = OpenCms.getRoleManager().hasRole(cms, CmsRole.ADMINISTRATOR.forOrgUnit(user.getOuFqn()));
+                visible &= OpenCms.getRoleManager().hasRole(cms, user.getName(), CmsRole.ELEMENT_AUTHOR);
             } catch (CmsException e) {
                 // should never happen
                 if (LOG.isErrorEnabled()) {

diff --git a/src/org/opencms/main/CmsSessionManager.java b/src/org/opencms/main/CmsSessionManager.java
@@ -419,7 +419,7 @@ public void sendBroadcast(CmsUser fromUser, String message, CmsUser toUser) {
     public String switchUser(CmsObject cms, HttpServletRequest req, CmsUser user) throws CmsException {
 
         // only user with root administrator role are allowed to switch the user
-        OpenCms.getRoleManager().checkRole(cms, CmsRole.ROOT_ADMIN.forOrgUnit(user.getOuFqn()));
+        OpenCms.getRoleManager().checkRole(cms, CmsRole.ADMINISTRATOR.forOrgUnit(user.getOuFqn()));
         CmsSessionInfo info = getSessionInfo(req);
         HttpSession session = req.getSession(false);
         if ((info == null) || (session == null)) {
@@ -679,12 +679,11 @@ protected void sessionCreated(HttpSessionEvent event) {
             m_sessionCountCurrent = (m_sessionCountCurrent <= 0) ? 1 : (m_sessionCountCurrent + 1);
             m_sessionCountTotal++;
             if (LOG.isInfoEnabled()) {
-                LOG.info(
-                    tid
-                        + Messages.get().getBundle().key(
-                            Messages.LOG_SESSION_CREATED_2,
-                            new Integer(m_sessionCountTotal),
-                            new Integer(m_sessionCountCurrent)));
+                LOG.info(tid
+                    + Messages.get().getBundle().key(
+                        Messages.LOG_SESSION_CREATED_2,
+                        new Integer(m_sessionCountTotal),
+                        new Integer(m_sessionCountCurrent)));
             }
         }