Skip to content
Snippets Groups Projects
Commit 8e2b815a authored by tpylak's avatar tpylak
Browse files

LMS-2268 fix bug

SVN: 21643
parent 44019e60
No related branches found
No related tags found
No related merge requests found
...@@ -120,8 +120,14 @@ public class MaterialFeaturesFromAllExperimentsGrid extends ...@@ -120,8 +120,14 @@ public class MaterialFeaturesFromAllExperimentsGrid extends
TableModelRowWithObject<MaterialSimpleFeatureVectorSummary> rowItem, TableModelRowWithObject<MaterialSimpleFeatureVectorSummary> rowItem,
boolean specialKeyPressed) boolean specialKeyPressed)
{ {
String experimentPermId = MaterialSimpleFeatureVectorSummary summaryOrNull =
rowItem.getObjectOrNull().getExperiment().getPermId(); rowItem.getObjectOrNull();
if (summaryOrNull == null)
{
return;
}
String experimentPermId = summaryOrNull.getExperiment().getPermId();
// NOTE: even in not-embedded mode we open specific standalone summary // NOTE: even in not-embedded mode we open specific standalone summary
// view instead of material detail view (which contains the summary view // view instead of material detail view (which contains the summary view
// as one of its tabs). The reason is that in such a case we are already // as one of its tabs). The reason is that in such a case we are already
...@@ -136,15 +142,18 @@ public class MaterialFeaturesFromAllExperimentsGrid extends ...@@ -136,15 +142,18 @@ public class MaterialFeaturesFromAllExperimentsGrid extends
ISerializableComparable value) ISerializableComparable value)
{ {
ExperimentSearchCriteria experiment = getExperimentCriteria(entity); ExperimentSearchCriteria experiment = getExperimentCriteria(entity);
return ScreeningLinkExtractor.createMaterialDetailsLink(material, String link =
experiment); ScreeningLinkExtractor.createMaterialDetailsLink(material,
experiment);
return link;
} }
}); });
} }
private boolean getRestrictGlobalScopeLinkToProject() private boolean getRestrictGlobalScopeLinkToProject()
{ {
return experimentSearchCriteria.tryGetProjectIdentifier() != null; return experimentSearchCriteria != null
&& experimentSearchCriteria.tryGetProjectIdentifier() != null;
} }
private ExperimentSearchCriteria getExperimentCriteria( private ExperimentSearchCriteria getExperimentCriteria(
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment