Changeset 5989

Timestamp:

Mar 2, 2012, 3:10:02 PM (11 years ago)

Author:

Nicklas Nordborg

Message:

Fixes #1661: Can't export 'Raw bioassays' column in the Extracts list page

File:

• branches/3.0-stable/www/biomaterials/extracts/index.jsp (modified) (3 diffs)

branches/3.0-stable/www/biomaterials/extracts/index.jsp

@@ -38 +38 @@
   import="net.sf.basedb.core.Tag"
   import="net.sf.basedb.core.PhysicalBioAssay"
+  import="net.sf.basedb.core.RawBioAssay"
   import="net.sf.basedb.core.ItemSubtype"
   import="net.sf.basedb.core.ItemQuery"
@@ -92 +93 @@
     cc.setObject("export.formatter.&childCreationEvents(event.physicalBioAssay.name)", new NameableFormatter());
     cc.setObject("export.formatter.&childCreationEvents(event.bioMaterial.name)", new NameableFormatter());
+    cc.setObject("export.formatter.&rawBioAssays(name)", new NameableFormatter());
     cc.setObject("export.formatter.parentType", new ItemTypeFormatter());
     
@@ -122 +124 @@
     parentExtractsQuery.include(cc.getInclude());
     cc.setObject("export.dataloader.&creationEvent.sources(bioMaterial.name)", new ParentBioMaterialLoader(parentExtractsQuery, restrictionParameter));
+    
+    // Child raw bioassays
+    final ItemQuery<RawBioAssay> rawBioAssayQuery = RawBioAssay.getQuery();
+    rawBioAssayQuery.restrict(Restrictions.eq(Hql.property("parentExtract"), Expressions.parameter(restrictionParameter)));
+    rawBioAssayQuery.order(Orders.asc(Hql.property("name")));
+    rawBioAssayQuery.include(cc.getInclude());
+    cc.setObject("export.dataloader.&rawBioAssays(name)", new ItemQueryLoader(rawBioAssayQuery, restrictionParameter));
   }
 %>