Ignore:
Timestamp:
Oct 5, 2017, 12:54:16 PM (4 years ago)
Author:
Nicklas Nordborg
Message:

References #2097: Implement support for device verification

Added list/view/edit pages to the web client for devices.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/www/include/menu.jsp

    r7295 r7407  
    6262  import="net.sf.basedb.clients.web.util.HTML"
    6363  import="net.sf.basedb.clients.web.resources.Bundle"
     64  import="net.sf.basedb.util.EmailUtil"
    6465  import="net.sf.basedb.util.Values"
    6566  import="net.sf.basedb.util.resources.ResourceBundleWrapper"
     
    507508    final boolean hasJobs               = !sc.hasPermission(Permission.DENIED, Item.JOB);
    508509    final boolean hasSessions           = !sc.hasPermission(Permission.DENIED, Item.SESSION);
     510    final boolean hasDevices            = !sc.hasPermission(Permission.DENIED, Item.USERDEVICE);
     511    final boolean supportsDeviceVerification = EmailUtil.isEnabled() &&
     512        (user.getUseDeviceVerification() || sc.hasPermission(Permission.READ, Item.USERDEVICE));
    509513    %>
    510514    <m:menu
     
    569573        tooltip="<%=menu.getString("jobs.tooltip", hasJobs)%>"
    570574        enabled="<%=hasJobs%>"
    571       />
    572       <m:menuitem
    573         title="<%=common.getString("item.session+")%>"
    574         url="<%=root+"views/sessions/index.jsp?ID="+ID%>"
    575         tooltip="<%=menu.getString("sessions.tooltip", hasSessions)%>"
    576         enabled="<%=hasSessions%>"
    577575      />
    578576      <m:menuseparator />
     
    669667        data-popup="ResetFilter, 450, 300"
    670668        tooltip="<%=menu.getString("resetlistsettings.tooltip")%>"
     669      />
     670      <m:menuseparator />
     671      <m:menuitem
     672        title="<%=common.getString("item.userdevice+")%>"
     673        url="<%=root+"views/devices/index.jsp?ID="+ID%>"
     674        tooltip="<%=menu.getString("devices.tooltip", hasDevices)%>"
     675        enabled="<%=hasDevices%>"
     676        visible="<%=supportsDeviceVerification %>"
     677      />
     678      <m:menuitem
     679        title="<%=common.getString("item.session+")%>"
     680        url="<%=root+"views/sessions/index.jsp?ID="+ID%>"
     681        tooltip="<%=menu.getString("sessions.tooltip", hasSessions)%>"
     682        enabled="<%=hasSessions%>"
    671683      />
    672684      <m:menuseparator />
Note: See TracChangeset for help on using the changeset viewer.