Changeset 5049

Timestamp:

Aug 17, 2009, 1:17:51 PM (13 years ago)

Author:

Martin Svensson

Message:

Fixes #1356 Blank page when listing wells for a plate.

Location:

trunk

Files:

• src/core/net/sf/basedb/core/Well.java (modified) (2 diffs)
• www/lims/plates/wells/list_wells.jsp (modified) (1 diff)

trunk/src/core/net/sf/basedb/core/Well.java

@@ -330 +330 @@
   
   /**
+    Get the reporter in this well. 
+    The initialization of the reporter can be forced.
+      @param forceInitialization TRUE if the initialization of
+        the reporter should be forced, FALSE otherwise.
+      @return A <code>ReporterData</code> object or null if no
+      reporter has been specified.
+      @since 2.13
+   */
+  public ReporterData getReporter(boolean forceInitialization)
+  {
+    if (!getSessionControl().hasPermission(Permission.READ, Item.REPORTER))
+    {
+      throw new PermissionDeniedException(Permission.READ, "Reporter");
+    }
+    ReporterData reporter = getData().getReporter();
+    if (forceInitialization) org.hibernate.Hibernate.initialize(reporter);
+    HibernateUtil.evictData(getDbControl().getHibernateSession(), reporter);    
+    return reporter;
+  }
+  
+  /**
     Set the reporter of this well.
     @param reporter The new reporter or null if the reporter is unknown
@@ -352 +373 @@
     getData().setReporter(reporter);
   }
-
 }

trunk/www/lims/plates/wells/list_wells.jsp

@@ -117 +117 @@
   {
     final ItemQuery<Well> query = Base.getConfiguredQuery(dc, cc, true, plate.getWells(), mode);
-    query.join(Hql.leftJoin(null, "reporter", "rpt", null, false));
+    query.join(Hql.leftJoin(null, "reporter", "rpt", null, true));
     if (!"row".equals(cc.getSortProperty())) query.order(Orders.asc(Hql.property("row")));
     if (!"column".equals(cc.getSortProperty())) query.order(Orders.asc(Hql.property("column")));