Changeset 6991

Timestamp:

Nov 2, 2015, 11:18:48 AM (8 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:

• src/clients/web/net/sf/basedb/clients/web/resources/common.properties (modified) (1 diff)
• src/clients/web/net/sf/basedb/clients/web/resources/menu.properties (modified) (1 diff)
• www/biomaterials/kits (added)
• www/biomaterials/kits/edit_kit.jsp (added)
• www/biomaterials/kits/index.jsp (added)
• www/biomaterials/kits/kits.js (added)
• www/biomaterials/kits/list_kits.jsp (added)
• www/biomaterials/kits/view_kit.jsp (added)
• www/include/menu.jsp (modified) (3 diffs)
• www/include/scripts/main-2.js (modified) (1 diff)

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

@@ -108 +108 @@
 item.tag  Tag
 item.tag+ Tags
+item.kit  Kit
+item.kit+ Kits
 item.bioplate Bioplate
 item.bioplate+  Bioplates

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

@@ -114 +114 @@
 extracts.tooltip.1  Manage extracts
 extracts.tooltip.0  You do not have permission to manage extracts
+# ---------------
 tags.tooltip.1  Manage tags
 tags.tooltip.0  You do not have permission to manage tags
+kits.tooltip.1  Manage kits
+kits.tooltip.0  You do not have permission to manage kits
 # --------------
 bioplates.tooltip.1 Manage bio plates

trunk/www/include/menu.jsp

@@ -688 +688 @@
     final boolean hasBioPlateTypes  = !sc.hasPermission(Permission.DENIED, Item.BIOPLATETYPE);
     final boolean hasBioPlateEventTypes = !sc.hasPermission(Permission.DENIED, Item.BIOPLATEEVENTTYPE);
+    
+    final boolean hasKits = !sc.hasPermission(Permission.DENIED, Item.KIT);
+
     final boolean hasBioLims      =  hasTags || hasBioSources || hasSamples || hasExtracts || 
-                      hasBioPlates || hasBioPlateTypes || hasBioPlateEventTypes;
+                      hasBioPlates || hasBioPlateTypes || hasBioPlateEventTypes ||
+                      hasKits;
     
     if (hasBioLims)
@@ -716 +720 @@
           enabled="<%=hasExtracts%>"
         />
+        <m:menuseparator />
         <m:menuitem
           title="<%=common.getString("item.tag+")%>"
@@ -721 +726 @@
           tooltip="<%=menu.getString("tags.tooltip", hasTags)%>"
           enabled="<%=hasTags%>"
+        />
+        <m:menuitem
+          title="<%=common.getString("item.kit+")%>"
+          url="<%=root+"biomaterials/kits/index.jsp?ID="+ID%>"
+          tooltip="<%=menu.getString("kits.tooltip", hasKits)%>"
+          enabled="<%=hasKits%>"
         />
         <m:menuseparator />

trunk/www/include/scripts/main-2.js

@@ -1996 +1996 @@
     controllers['JOB'] = { url:'views/jobs/index.jsp', width:750, height:500, popup:true, edit:false };
     controllers['JOBAGENT'] = { url:'admin/jobagents/index.jsp', width:750, height:500 };
+    controllers['KIT'] = { url:'biomaterials/kits/index.jsp', width:750, height:500 };
     controllers['MESSAGE'] = { url:'my_base/messages/index.jsp', width:600, height:400, popup:true, edit:false };
     controllers['MIMETYPE'] = { url:'admin/mimetypes/index.jsp', width:600, height:400 };