Changeset 2108

Timestamp:

Oct 29, 2013, 11:10:58 AM (9 years ago)

Author:

Nicklas Nordborg

Message:

References #512: Updates to the register pooled libraries wizard

Fixed issue with selecting pools coming from multiple library plates.

Location:

extensions/net.sf.basedb.reggie/trunk/resources/libprep

Files:

• pool_protocol.jsp (modified) (2 diffs)
• pool_registration.jsp (modified) (3 diffs)

extensions/net.sf.basedb.reggie/trunk/resources/libprep/pool_protocol.jsp

@@ -51 +51 @@
     {
       var pool = pools[poolNo];
-      
       // Shortcut to single-plate pools
       var libPlateForPool = pool.libPlates.length == 1 ? pool.libPlates[0] : null;
@@ -126 +125 @@
     // If a libplate is selected, only show pools that have all libraries from that plate
     // If no libplate is selected, only show pools that have libraries from multiple plates
-    var addPool = (libPlateId && pool.libPlate.id == libPlateId) || (!libPlateId && pool.libPlate == null);
+    var addPool = (libPlateId && pool.libPlate && pool.libPlate.id == libPlateId) || (!libPlateId && pool.libPlate == null);
     if (addPool)
     {

extensions/net.sf.basedb.reggie/trunk/resources/libprep/pool_registration.jsp

@@ -130 +130 @@
     // If a libplate is selected, only show pools that have all libraries from that plate
     // If no libplate is selected, only show pools that have libraries from multiple plates
-    var addPool = (libPlateId && pool.libPlate.id == libPlateId) || (!libPlateId && pool.libPlate == null);
+    var addPool = (libPlateId &&  pool.libPlate && pool.libPlate.id == libPlateId) || (!libPlateId && pool.libPlate == null);
     if (addPool)
     {
@@ -148 +148 @@
     frm.pools.disabled = false;
   }
-  poolOnBlur();
-}
-
-function poolOnBlur()
+  poolOnChange();
+}
+
+function poolOnChange()
 {
   var frm = document.forms['reggie'];
@@ -440 +440 @@
         <td class="prompt">Pools</td>
         <td class="input"><select style="width:90%;" size="6" 
-            name="pools" id="pools" multiple></select>
+            name="pools" id="pools" multiple onchange="poolOnChange()"></select>
         </td>
         <td class="status" id="pools.status"></td>