Changeset 4147 for trunk/www/views/hybridizations/edit_hybridization.jsp

Timestamp:

Feb 18, 2008, 2:18:05 PM (16 years ago)

Author:

Nicklas Nordborg

Message:

References #868: Support for chips with multiple arrays

Fixes broken query and javascript for selecting parent labeled extracts

File:

• trunk/www/views/hybridizations/edit_hybridization.jsp (modified) (3 diffs)

trunk/www/views/hybridizations/edit_hybridization.jsp

@@ -48 +48 @@
   import="net.sf.basedb.core.PermissionDeniedException"
   import="net.sf.basedb.core.BaseException"
+  import="net.sf.basedb.core.Type"
+  import="net.sf.basedb.core.query.Restrictions"
+  import="net.sf.basedb.core.query.Expressions"
   import="net.sf.basedb.core.query.Orders"
   import="net.sf.basedb.core.query.Hql"
@@ -137 +140 @@
     if (Values.getBoolean(request.getParameter("useParents")))
     {
-      labeledExtractsQuery = LabeledExtract.getQuery();
-      labeledExtractsQuery.include(Include.ALL);
-      labeledExtractsQuery.order(Orders.asc(Hql.property("name")));
+      ItemContext lc = sc.getCurrentContext(Item.LABELEDEXTRACT);
+      if (lc.getSelected().size() > 0)
+      {
+        labeledExtractsQuery = LabeledExtract.getQuery();
+        labeledExtractsQuery.include(Include.ALL);
+        labeledExtractsQuery.order(Orders.asc(Hql.property("name")));
+        labeledExtractsQuery.restrict(Restrictions.in(Hql.property("id"), 
+          Expressions.parameter("selected", lc.getSelected(), Type.INT)));
+      }
     }
     
@@ -400 +409 @@
       if (item && item.id)
       {
-        var i = item.value.indexOf(':');
+        var i = item.value ? item.value.indexOf(':') : -1;
         frm.used_quantity.value = i >= 0 ? item.value.substring(0, i) : item.value;
         frm.array_index.value = i > 0 ? item.value.substring(i+1) : '1';