Changeset 7295

Timestamp:

Feb 20, 2017, 8:09:27 AM (6 years ago)

Author:

Nicklas Nordborg

Message:

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

Added a "Inactive roles" tab in the "Preferences" dialog. This allows a user to set roles that should be inactive by default after logging in.

Location:

trunk

Files:

• src/clients/web/net/sf/basedb/clients/web/resources/menu.properties (modified) (1 diff)
• www/include/menu.jsp (modified) (2 diffs)
• www/login.jsp (modified) (2 diffs)
• www/my_base/user/preferences.jsp (modified) (4 diffs)
• www/my_base/user/submit_user.jsp (modified) (2 diffs)

trunk/src/clients/web/net/sf/basedb/clients/web/resources/menu.properties

@@ -275 +275 @@
 myroles.tooltip.0 De-activate this role
 myroles.tooltip.1 Activate this role
+myroles.options   Options
+myroles.options.tooltip Configure default inactive roles
 
 ## Refresh menu ##

trunk/www/include/menu.jsp

@@ -1215 +1215 @@
           %>
           <m:menuitem 
-            title="<%=r.getName() %>"
+            title="<%=HTML.encodeTags(r.getName()) %>"
             tooltip="<%=menu.getString("myroles.tooltip", isInactive)%>"
             icon="<%=isInactive ? "option_unselected.png" : "option_selected.png"%>"
@@ -1223 +1223 @@
           <%
         }
+        %>
+        <m:menuseparator />
+        <m:menuitem
+          title="<%=menu.getString("myroles.options") + "…"%>"
+          url="<%=root+"my_base/user/preferences.jsp?ID="+ID+"&amp;page=inactiveRoles"%>"
+          data-popup="Preferences, 600, 400" 
+          tooltip="<%=menu.getString("myroles.options.tooltip")%>"
+        />
+        <%
       }
       %>

trunk/www/login.jsp

@@ -44 +44 @@
   import="net.sf.basedb.util.Values"
   import="java.util.Iterator"
+  import="java.util.Set"
+  import="java.util.HashSet"
+  import="java.util.Arrays"
 %>
 <%@ taglib prefix="base" uri="/WEB-INF/base.tld" %>
@@ -121 +124 @@
   if (sc.isLoggedIn())
   {
+    // Some roles may be inactive by default
+    String tmp = Values.getStringOrNull(sc.getUserClientSetting("inactiveRoles"));
+    if (tmp != null)
+    {
+      Set<Integer> defaultInactive = new HashSet<Integer>(Arrays.asList(Values.getInt(tmp.split(":"))));
+      for (int roleId : defaultInactive)
+      {
+        sc.setRoleInactive(roleId, true);
+      }
+    }
+    
     int lastActiveProjectId = Values.getInt(sc.getUserClientSetting("projects.lastactive"));
     String startPageId = sc.getUserClientSetting("start-page-id");

trunk/www/my_base/user/preferences.jsp

@@ -39 +39 @@
   import="net.sf.basedb.core.DbControl"
   import="net.sf.basedb.core.User"
+  import="net.sf.basedb.core.Role"
+  import="net.sf.basedb.core.Type"
   import="net.sf.basedb.core.Metadata"
   import="net.sf.basedb.core.ItemContext"
+  import="net.sf.basedb.core.ItemQuery"
   import="net.sf.basedb.core.Permission"
+  import="net.sf.basedb.core.query.Hql"
+  import="net.sf.basedb.core.query.Restrictions"
+  import="net.sf.basedb.core.query.Expressions"
+  import="net.sf.basedb.core.query.Orders"
   import="net.sf.basedb.util.ToStringComparator"
   import="net.sf.basedb.clients.web.Base"
@@ -51 +58 @@
   import="net.sf.basedb.clients.web.extensions.startpage.StartPageAction"
   import="net.sf.basedb.util.Values"
+  import="java.util.Collections"
   import="java.util.List"
   import="java.util.Set"
@@ -95 +103 @@
   allItems.add(Item.BIOASSAYSET);
   
+  // Load roles
+  List<Role> roles = null;
+  Set<Integer> roleIds = sc.getAllRoles();
+  Set<Integer> defaultInactive = Collections.emptySet();
+  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);
+    
+    String tmp = Values.getStringOrNull(sc.getUserClientSetting("inactiveRoles"));
+    if (tmp != null)
+    {
+      defaultInactive = new HashSet<Integer>(Arrays.asList(Values.getInt(tmp.split(":"))));
+    }
+  }
+
   JspContext context = ExtensionsControl.createContext(dc, pageContext, null, user);
   ExtensionsInvoker<StartPageAction> invoker = (ExtensionsInvoker<StartPageAction>)ExtensionsControl.useExtensions(context, "net.sf.basedb.clients.web.start-page");
@@ -505 +532 @@
         </table>
       </t:tab>
+      <t:tab
+        id="inactiveRoles"
+        title="Inactive roles"
+        helpid="userpreferences.inactiveroles"
+        tooltip="Select if any roles should be inactive by default after logging in"
+        visible="<%=roles != null && roles.size() > 0%>"
+        >
+        <table class="fullform">
+        <tr class="dynamic">
+          <th>Default roles</th>
+          <td>
+            <b>Inactive at login</b><br>
+            <%
+            for (Role r : roles)
+            {
+              boolean inactive = defaultInactive.contains(r.getId());
+              %>
+              <label><input type="checkbox" id="role.<%=r.getId()%>"
+                name="inactiveRoles" value="<%=r.getId()%>"
+                <%=inactive ? "checked" : "" %>
+                ><%=HTML.encodeTags(r.getName())%></label><br>
+              <%
+            }
+            %>
+            <div class="messagecontainer note" style="margin-top: 1em;">
+            Select all roles that should be inactive by default 
+            after logging in. Note! This setting only applies when
+            logging in via the web interface.
+            </div>
+          </td>
+        </tr>
+        </table>
+        
+      </t:tab>
     </t:tabcontrol>
     </form>

trunk/www/my_base/user/submit_user.jsp

@@ -48 +48 @@
   import="net.sf.basedb.clients.web.formatter.FormatterFactory"
   import="java.util.Arrays"
+  import="java.util.Collections"
   import="java.util.List"
 %>
@@ -173 +174 @@
       stickyItems == null ? "" : Values.getString(Arrays.asList(stickyItems), ":", true));
     
+    // Roles tab
+    String[] inactiveRoles = request.getParameterValues("inactiveRoles");
+    sc.setUserClientSetting("inactiveRoles", inactiveRoles == null ? null : Values.getString(Arrays.asList(inactiveRoles), ":", true));
+    
     message = "Preferences saved";
   }