From 20795c8061b837fbf719095e4f429474a12214cd Mon Sep 17 00:00:00 2001
From: felmer <felmer>
Date: Mon, 26 Oct 2009 14:11:21 +0000
Subject: [PATCH] LMS-1215 bug fixed
SVN: 13068
---
.../web/client/application/model/SampleModelFactory.java | 9 +++++----
.../client/application/ui/sample/SampleBrowserGrid.java | 2 +-
2 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/model/SampleModelFactory.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/model/SampleModelFactory.java
index cfcf402418b..a803f794588 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/model/SampleModelFactory.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/model/SampleModelFactory.java
@@ -52,10 +52,11 @@ public final class SampleModelFactory
parentColumnsSchema);
}
- public static BaseEntityModel<Sample> createModel(GridRowModel<Sample> sampleModel)
+ public static BaseEntityModel<Sample> createModel(GridRowModel<Sample> sampleModel,
+ SampleType sampleType)
{
List<? extends IColumnDefinitionUI<Sample>> allColumnsDefinition =
- new SampleModelFactory().createColumnsSchemaForRendering(sampleModel);
+ new SampleModelFactory().createColumnsSchemaForRendering(sampleModel, sampleType);
BaseEntityModel<Sample> model =
new BaseEntityModel<Sample>(sampleModel, allColumnsDefinition);
return model;
@@ -70,12 +71,12 @@ public final class SampleModelFactory
}
private List<IColumnDefinitionUI<Sample>> createColumnsSchemaForRendering(
- GridRowModel<Sample> sampleModel)
+ GridRowModel<Sample> sampleModel, SampleType sampleType)
{
List<IColumnDefinitionUI<Sample>> columns =
entityGridModelFactory.createColumnsSchemaForRendering(sampleModel);
List<AbstractParentSampleColDef> parentColumns =
- createParentColumnsSchema(null, sampleModel.getOriginalObject().getSampleType());
+ createParentColumnsSchema(null, sampleType);
columns.addAll(parentColumns);
return columns;
}
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/sample/SampleBrowserGrid.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/sample/SampleBrowserGrid.java
index abc62ef4513..6df5bc7071e 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/sample/SampleBrowserGrid.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/ui/sample/SampleBrowserGrid.java
@@ -443,7 +443,7 @@ public class SampleBrowserGrid extends
@Override
protected BaseEntityModel<Sample> createModel(GridRowModel<Sample> entity)
{
- return SampleModelFactory.createModel(entity);
+ return SampleModelFactory.createModel(entity, criteria.tryGetSampleType());
}
@Override
--
GitLab