From 6492c1cca1b3de50517bce9b870fb97eb38ba9ff Mon Sep 17 00:00:00 2001 From: anttil <anttil> Date: Fri, 3 Feb 2017 14:36:17 +0000 Subject: [PATCH] SSDM-4187: 19. Sample history doesn't show 'Owned by project'. Instead 'Owned by space' is shown - display project identifier instead of perm id in sample history. SVN: 37680 --- .../client/web/server/resultset/EntityHistoryProvider.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/resultset/EntityHistoryProvider.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/resultset/EntityHistoryProvider.java index 715a34a4768..10f51bc2c82 100644 --- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/resultset/EntityHistoryProvider.java +++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/server/resultset/EntityHistoryProvider.java @@ -92,6 +92,12 @@ public class EntityHistoryProvider extends value = entry.getVocabularyTerm(); } } + + if (value == null && entry.tryGetRelatedProject() != null) + { + value = entry.tryGetRelatedProject().getIdentifier(); + } + if (value == null && entry.tryGetRelatedEntity() != null) { builder.column(VALUE).addEntityLink( -- GitLab