Changeset 1488

Timestamp:

Nov 30, 2011, 8:29:45 AM (11 years ago)

Author:

Nicklas Nordborg

Message:

Merging changes from Reggie 2.0.1 into the trunk.

Location:

extensions/net.sf.basedb.reggie/trunk

Files:

• . (modified) (1 prop)
• src/net/sf/basedb/reggie/dao/SpecimenTube.java (modified) (1 diff)
• src/net/sf/basedb/reggie/servlet/PartitionRegistrationServlet.java (modified) (1 diff)

extensions/net.sf.basedb.reggie/trunk/src/net/sf/basedb/reggie/dao/SpecimenTube.java

@@ -109 +109 @@
     tubeQuery.order(Orders.desc(Hql.property("id")));
     tubeQuery.include(Include.ALL);
+    tubeQuery.exclude(Include.REMOVED);
     
     List<Sample> tubes = tubeQuery.list(dc);

extensions/net.sf.basedb.reggie/trunk/src/net/sf/basedb/reggie/servlet/PartitionRegistrationServlet.java

@@ -247 +247 @@
                 hisSample.setOriginalQuantity(hisWeight);
                 BioMaterialEvent creationEvent = hisSample.getCreationEvent();
-                creationEvent.addSource(hisSample).setUsedQuantity(hisWeight);
+                creationEvent.addSource(specimen).setUsedQuantity(hisWeight);
                 
                 Reggie.setAnnotationValue(hisSample, partitionDateType, partitionDate);