Changeset 5542

Timestamp:

Jan 17, 2011, 1:34:18 PM (11 years ago)

Author:

Nicklas Nordborg

Message:

References #1564: Move biomaterial on plates

Fixes an issue with an incorrect filter when selecting destination plate if used with plates containing extracts or labeled extracts.

File:

• trunk/www/biomaterials/wizards/move_biomaterial.jsp (modified) (3 diffs)

trunk/www/biomaterials/wizards/move_biomaterial.jsp

@@ -22 +22 @@
   @author Nicklas
 --%>
-<%@page import="net.sf.basedb.core.BioPlateEventType"%>
 <%@ page pageEncoding="UTF-8" session="false"
   import="net.sf.basedb.core.BioPlate"
   import="net.sf.basedb.core.BioPlateEvent"
+  import="net.sf.basedb.core.PermissionDeniedException"
+  import="net.sf.basedb.core.BioPlateEventType"
   import="net.sf.basedb.core.MeasuredBioMaterial"
   import="net.sf.basedb.core.Hardware"
@@ -63 +64 @@
   List<Protocol> recentProtocols = (List<Protocol>)cc.getRecent(dc, Item.PROTOCOL);
   
-  Item itemType = Item.SAMPLE;
+  Item itemType = null;
+  try
+  {
+    itemType = sourcePlate.getBioPlateType().getBioMaterialType();
+  }
+  catch (PermissionDeniedException ex)
+  {}
   
   final String clazz = "class=\"text\"";
@@ -350 +357 @@
       
       var url = '../bioplates/index.jsp?ID=<%=ID%>&cmd=UpdateContext&mode=selectone&callback=setBioPlateCallback';
-      url += '&resetTemporary=1&tmpfilter:INT:bioPlateType.bioMaterialType=|<%=itemType.getValue()%>'
+      url += '&resetTemporary=1&tmpfilter:INT:bioPlateType.bioMaterialType=<%=itemType == null ? "=" : "|" + itemType.getValue()%>'
       url += '&exclude='+sourcePlate.id;
       Main.openPopup(url, 'SelectBioPlate', 1000, 700);