Changeset 7294 for trunk/www/include/menu.jsp

Timestamp:

Feb 17, 2017, 11:15:35 AM (5 years ago)

Author:

Nicklas Nordborg

Message:

References #2043: Activating/deactivating roles on the fly in a login session

Implemented support for setting a role as inactive in the core. New public methods are in the SessionControl class.

The getRoles() method has been deprecated and replaced with other methods (since this method return ALL roles including inactive). Code that uses this method for permission checking may experience PermissionDeniedExceptions if a users has de-activated a role.

The "User" menu to the far right has been updated to include a section with roles where the user can toggle the active/inactive status.

The settings are not (yet) remebered between sessions. All roles start out in the active state after logging in.

File:

• trunk/www/include/menu.jsp (modified) (3 diffs)

trunk/www/include/menu.jsp

@@ -53 +53 @@
   import="net.sf.basedb.core.ItemResultList"
   import="net.sf.basedb.core.Type"
+  import="net.sf.basedb.core.Role"
   import="net.sf.basedb.core.query.Orders"
   import="net.sf.basedb.core.query.Order"
@@ -1162 +1163 @@
     final boolean hasImpersonate = 
       !sc.isImpersonated() && sc.hasSystemPermission(Permission.ACT_AS_ANOTHER_USER);
+    
+    List<Role> roles = null;
+    Set<Integer> roleIds = sc.getAllRoles();
+    if (roleIds != null && roleIds.size() > 0)
+    {
+      ItemQuery<Role> roleQuery = Role.getQuery();
+      roleQuery.restrict(Restrictions.in(Hql.property("id"), Expressions.parameter("roles")));
+      roleQuery.setParameter("roles", roleIds, Type.INT);
+      roleQuery.order(Orders.asc(Hql.property("name")));
+      roles = roleQuery.list(dc);
+    }
     %>
     <m:menu
@@ -1186 +1198 @@
         tooltip="<%=menu.getString("logout.tooltip")%>" 
       />
+      <%
+      if (roles != null && roles.size() > 0)
+      {
+        %>
+        <m:menuseparator />
+        <m:menuitem 
+          title="<%=menu.getString("myroles.title")%>"
+          subclass="menusection"
+          enabled="false" 
+        />
+        <m:menuseparator />
+        <%
+        for (Role r : roles)
+        {
+          boolean isInactive = sc.isRoleInactive(r.getId());
+          %>
+          <m:menuitem 
+            title="<%=r.getName() %>"
+            tooltip="<%=menu.getString("myroles.tooltip", isInactive)%>"
+            icon="<%=isInactive ? "option_unselected.png" : "option_selected.png"%>"
+            url="<%=root+"my_base/toggle_active_role.jsp?ID="+ID+"&role_id="+r.getId()%>"
+            data-popup="ActivateRole, 300, 200"
+          />
+          <%
+        }
+      }
+      %>
     </m:menu>
     <%