From 2c7f064e4f84b04373b7991fd970eb1606b4687e Mon Sep 17 00:00:00 2001
From: jensp <jensp@8810af33-2d31-482b-a856-94f89814c4df>
Date: Wed, 3 May 2017 18:16:06 +0000
Subject: [PATCH] CCM NG/ccm-cms: Some bugfixes

git-svn-id: https://svn.libreccm.org/ccm/ccm_ng@4704 8810af33-2d31-482b-a856-94f89814c4df
---
 .../librecms/contentsection/ContentItemManager.java   | 11 ++++++++---
 .../after-copy-to-folder-in-other-section.xml         |  2 +-
 .../after-copy-to-other-folder.xml                    |  2 +-
 .../after-copy-to-same-folder.xml                     |  2 +-
 .../after-move-to-other-section.xml                   |  2 +-
 .../ContentItemManagerTest/after-move.xml             |  2 +-
 6 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/ccm-cms/src/main/java/org/librecms/contentsection/ContentItemManager.java b/ccm-cms/src/main/java/org/librecms/contentsection/ContentItemManager.java
index 0f99f9517..38fb71b14 100644
--- a/ccm-cms/src/main/java/org/librecms/contentsection/ContentItemManager.java
+++ b/ccm-cms/src/main/java/org/librecms/contentsection/ContentItemManager.java
@@ -881,6 +881,8 @@ public class ContentItemManager {
 
         liveItem.setLifecycle(lifecycle);
         liveItem.setWorkflow(draftItem.getWorkflow());
+        
+        contentItemRepo.save(liveItem);
 
         final List<Category> oldCategories = liveItem
             .getCategories()
@@ -894,12 +896,16 @@ public class ContentItemManager {
                 throw new RuntimeException(ex);
             }
         });
+        
+        contentItemRepo.save(liveItem);
 
         draftItem.getCategories().forEach(categorization -> categoryManager
             .addObjectToCategory(liveItem,
                                  categorization.getCategory(),
                                  categorization.getType()));
 
+        contentItemRepo.save(liveItem);
+        
         for (int i = 0; i < draftItem.getAttachments().size(); i++) {
             final AttachmentList sourceList = draftItem.getAttachments().get(i);
 
@@ -968,10 +974,9 @@ public class ContentItemManager {
                 entityManager.merge(targetList);
             }
         }
+        
+        contentItemRepo.save(liveItem);
 
-//        for (AttachmentList attachmentList : item.getAttachments()) {
-//            copyAttachmentList(attachmentList, liveItem);
-//        }
         final BeanInfo beanInfo;
         try {
             beanInfo = Introspector.getBeanInfo(item.getClass());
diff --git a/ccm-cms/src/test/resources/datasets/org/librecms/contentsection/ContentItemManagerTest/after-copy-to-folder-in-other-section.xml b/ccm-cms/src/test/resources/datasets/org/librecms/contentsection/ContentItemManagerTest/after-copy-to-folder-in-other-section.xml
index 79cb0f4ae..9bbff0b53 100644
--- a/ccm-cms/src/test/resources/datasets/org/librecms/contentsection/ContentItemManagerTest/after-copy-to-folder-in-other-section.xml
+++ b/ccm-cms/src/test/resources/datasets/org/librecms/contentsection/ContentItemManagerTest/after-copy-to-folder-in-other-section.xml
@@ -682,7 +682,7 @@
     <ccm_core.categorizations categorization_id="-30110" 
                               category_id="-2300" 
                               object_id="-10110" 
-                              category_order="2" 
+                              category_order="1" 
                               object_order="1" 
                               category_index="false"
                               type="folder" />
diff --git a/ccm-cms/src/test/resources/datasets/org/librecms/contentsection/ContentItemManagerTest/after-copy-to-other-folder.xml b/ccm-cms/src/test/resources/datasets/org/librecms/contentsection/ContentItemManagerTest/after-copy-to-other-folder.xml
index d6de94233..b6eb7c0e6 100644
--- a/ccm-cms/src/test/resources/datasets/org/librecms/contentsection/ContentItemManagerTest/after-copy-to-other-folder.xml
+++ b/ccm-cms/src/test/resources/datasets/org/librecms/contentsection/ContentItemManagerTest/after-copy-to-other-folder.xml
@@ -676,7 +676,7 @@
     <ccm_core.categorizations categorization_id="-30500" 
                               category_id="-2120" 
                               object_id="-10500" 
-                              category_order="2" 
+                              category_order="1" 
                               object_order="1" 
                               category_index="false"
                               type="folder" />
diff --git a/ccm-cms/src/test/resources/datasets/org/librecms/contentsection/ContentItemManagerTest/after-copy-to-same-folder.xml b/ccm-cms/src/test/resources/datasets/org/librecms/contentsection/ContentItemManagerTest/after-copy-to-same-folder.xml
index fd714c0c2..fe218e65e 100644
--- a/ccm-cms/src/test/resources/datasets/org/librecms/contentsection/ContentItemManagerTest/after-copy-to-same-folder.xml
+++ b/ccm-cms/src/test/resources/datasets/org/librecms/contentsection/ContentItemManagerTest/after-copy-to-same-folder.xml
@@ -647,7 +647,7 @@
     <ccm_core.categorizations categorization_id="-30100" 
                               category_id="-2110" 
                               object_id="-10100" 
-                              category_order="2" 
+                              category_order="1" 
                               object_order="1" 
                               category_index="false"
                               type="folder" />
diff --git a/ccm-cms/src/test/resources/datasets/org/librecms/contentsection/ContentItemManagerTest/after-move-to-other-section.xml b/ccm-cms/src/test/resources/datasets/org/librecms/contentsection/ContentItemManagerTest/after-move-to-other-section.xml
index 61fa7316e..275c99798 100644
--- a/ccm-cms/src/test/resources/datasets/org/librecms/contentsection/ContentItemManagerTest/after-move-to-other-section.xml
+++ b/ccm-cms/src/test/resources/datasets/org/librecms/contentsection/ContentItemManagerTest/after-move-to-other-section.xml
@@ -566,7 +566,7 @@
     <ccm_core.categorizations categorization_id="-30100" 
                               category_id="-2300" 
                               object_id="-10100" 
-                              category_order="2" 
+                              category_order="1" 
                               object_order="1" 
                               category_index="false"
                               type="folder" />
diff --git a/ccm-cms/src/test/resources/datasets/org/librecms/contentsection/ContentItemManagerTest/after-move.xml b/ccm-cms/src/test/resources/datasets/org/librecms/contentsection/ContentItemManagerTest/after-move.xml
index e4f61020d..2e6e6afc9 100644
--- a/ccm-cms/src/test/resources/datasets/org/librecms/contentsection/ContentItemManagerTest/after-move.xml
+++ b/ccm-cms/src/test/resources/datasets/org/librecms/contentsection/ContentItemManagerTest/after-move.xml
@@ -567,7 +567,7 @@
     <ccm_core.categorizations categorization_id="-30100" 
                               category_id="-2120" 
                               object_id="-10100" 
-                              category_order="2" 
+                              category_order="1" 
                               object_order="1" 
                               category_index="false"
                               type="folder" />