Changeset 6991


Ignore:
Timestamp:
Nov 2, 2015, 11:18:48 AM (7 years ago)
Author:
Nicklas Nordborg
Message:

References #1958: Add Kit item

Added interface to the web client for listing, viewing and editing kits.

Location:
trunk
Files:
6 added
4 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/clients/web/net/sf/basedb/clients/web/resources/common.properties

    r6798 r6991  
    108108item.tag  Tag
    109109item.tag+ Tags
     110item.kit  Kit
     111item.kit+ Kits
    110112item.bioplate Bioplate
    111113item.bioplate+  Bioplates
  • trunk/src/clients/web/net/sf/basedb/clients/web/resources/menu.properties

    r6756 r6991  
    114114extracts.tooltip.1  Manage extracts
    115115extracts.tooltip.0  You do not have permission to manage extracts
     116# ---------------
    116117tags.tooltip.1  Manage tags
    117118tags.tooltip.0  You do not have permission to manage tags
     119kits.tooltip.1  Manage kits
     120kits.tooltip.0  You do not have permission to manage kits
    118121# --------------
    119122bioplates.tooltip.1 Manage bio plates
  • trunk/www/include/menu.jsp

    r6759 r6991  
    688688    final boolean hasBioPlateTypes  = !sc.hasPermission(Permission.DENIED, Item.BIOPLATETYPE);
    689689    final boolean hasBioPlateEventTypes = !sc.hasPermission(Permission.DENIED, Item.BIOPLATEEVENTTYPE);
     690   
     691    final boolean hasKits = !sc.hasPermission(Permission.DENIED, Item.KIT);
     692
    690693    final boolean hasBioLims      =  hasTags || hasBioSources || hasSamples || hasExtracts ||
    691                       hasBioPlates || hasBioPlateTypes || hasBioPlateEventTypes;
     694                      hasBioPlates || hasBioPlateTypes || hasBioPlateEventTypes ||
     695                      hasKits;
    692696   
    693697    if (hasBioLims)
     
    716720          enabled="<%=hasExtracts%>"
    717721        />
     722        <m:menuseparator />
    718723        <m:menuitem
    719724          title="<%=common.getString("item.tag+")%>"
     
    721726          tooltip="<%=menu.getString("tags.tooltip", hasTags)%>"
    722727          enabled="<%=hasTags%>"
     728        />
     729        <m:menuitem
     730          title="<%=common.getString("item.kit+")%>"
     731          url="<%=root+"biomaterials/kits/index.jsp?ID="+ID%>"
     732          tooltip="<%=menu.getString("kits.tooltip", hasKits)%>"
     733          enabled="<%=hasKits%>"
    723734        />
    724735        <m:menuseparator />
  • trunk/www/include/scripts/main-2.js

    r6916 r6991  
    19961996    controllers['JOB'] = { url:'views/jobs/index.jsp', width:750, height:500, popup:true, edit:false };
    19971997    controllers['JOBAGENT'] = { url:'admin/jobagents/index.jsp', width:750, height:500 };
     1998    controllers['KIT'] = { url:'biomaterials/kits/index.jsp', width:750, height:500 };
    19981999    controllers['MESSAGE'] = { url:'my_base/messages/index.jsp', width:600, height:400, popup:true, edit:false };
    19992000    controllers['MIMETYPE'] = { url:'admin/mimetypes/index.jsp', width:600, height:400 };
Note: See TracChangeset for help on using the changeset viewer.