BGBM BDI Projects
/
taxeditor.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'develop' of https://dev.e-taxonomy.eu/git/taxeditor into develop
[taxeditor.git]
/
eu.etaxonomy.taxeditor.editor
/
src
/
main
/
java
/
eu
/
etaxonomy
/
taxeditor
/
editor
/
group
/
authority
/
CdmAuthorityEditorInput.java
diff --git
a/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/group/authority/CdmAuthorityEditorInput.java
b/eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/group/authority/CdmAuthorityEditorInput.java
index b3b8d6437ddc4f6007e2b79419ab1b00cbca181c..fa78b41d88044db94249d9b55fe250b10df73211 100644
(file)
--- a/
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/group/authority/CdmAuthorityEditorInput.java
+++ b/
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/group/authority/CdmAuthorityEditorInput.java
@@
-157,6
+157,8
@@
public class CdmAuthorityEditorInput extends CdmEntitySessionInput implements IE
*/
@Override
public void merge() {
*/
@Override
public void merge() {
- group = CdmStore.getService(IGroupService.class).merge(group);
+ if(CdmStore.getCurrentSessionManager().isRemoting()) {
+ group = CdmStore.getService(IGroupService.class).merge(group, true).getMergedEntity();
+ }
}
}
}
}