From f5412a9f3bfb9a12c30135ee355ea159871ba4c5 Mon Sep 17 00:00:00 2001
From: pkupczyk <pkupczyk>
Date: Tue, 6 Nov 2012 07:43:39 +0000
Subject: [PATCH] SP-362 / BIS-246: Show metaproject tags in Web GUI and allow
editing them when editing an entity - operate on the current user's
metaprojects only when editing an entity (handle transient entities)
SVN: 27499
---
.../server/business/bo/AbstractBusinessObject.java | 11 +++++++++--
1 file changed, 9 insertions(+), 2 deletions(-)
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/AbstractBusinessObject.java b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/AbstractBusinessObject.java
index 2f1d45853bb..5b6b62a4ee8 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/AbstractBusinessObject.java
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/generic/server/business/bo/AbstractBusinessObject.java
@@ -236,8 +236,15 @@ abstract class AbstractBusinessObject implements IDAOFactory
metaprojects.add(metaproject);
}
- Collection<MetaprojectPE> currentMetaprojects =
- getMetaprojectDAO().listMetaprojectsForEntity(owner, entity);
+ Collection<MetaprojectPE> currentMetaprojects = null;
+
+ if (entity.getId() != null)
+ {
+ currentMetaprojects = getMetaprojectDAO().listMetaprojectsForEntity(owner, entity);
+ } else
+ {
+ currentMetaprojects = new HashSet<MetaprojectPE>();
+ }
Set<MetaprojectPE> metaprojectsToAdd = new HashSet<MetaprojectPE>();
Set<MetaprojectPE> metaprojectsToRemove = new HashSet<MetaprojectPE>();
--
GitLab