From 75ea524c0d9d13daf1324baa880416399b0ee084 Mon Sep 17 00:00:00 2001
From: jensp <jensp@8810af33-2d31-482b-a856-94f89814c4df>
Date: Tue, 4 Jul 2017 12:47:08 +0000
Subject: [PATCH] CCM NG/ccm-cms: - Some missing translations for the
 NewsItemPropertiesStep and the NewsItemPropertyForm - Code for deleting a
 ContentItem improved

git-svn-id: https://svn.libreccm.org/ccm/ccm_ng@4837 8810af33-2d31-482b-a856-94f89814c4df
---
 .../com/arsdigita/cms/contenttypes/ui/NewsPropertiesStep.java | 4 ++--
 .../java/org/librecms/contentsection/ContentItemManager.java  | 3 ++-
 .../org/librecms/contentsection/ContentItemRepository.java    | 2 +-
 .../src/main/resources/org/librecms/CmsResources.properties   | 2 ++
 .../main/resources/org/librecms/CmsResources_de.properties    | 2 ++
 .../main/resources/org/librecms/CmsResources_fr.properties    | 2 ++
 6 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/ccm-cms/src/main/java/com/arsdigita/cms/contenttypes/ui/NewsPropertiesStep.java b/ccm-cms/src/main/java/com/arsdigita/cms/contenttypes/ui/NewsPropertiesStep.java
index b89f81578..c84fe2be2 100755
--- a/ccm-cms/src/main/java/com/arsdigita/cms/contenttypes/ui/NewsPropertiesStep.java
+++ b/ccm-cms/src/main/java/com/arsdigita/cms/contenttypes/ui/NewsPropertiesStep.java
@@ -116,11 +116,11 @@ public class NewsPropertiesStep extends SimpleEditStep {
                   "name");
         sheet.add(new GlobalizedMessage("cms.contenttypes.ui.newsitem.lead",
                                         CmsConstants.CMS_BUNDLE),
-                  "lead");
+                  "description");
 
         // Show news item on homepage?
         sheet.add(new GlobalizedMessage(
-            "cms.contenttypes.ui.newsitem.news_date",
+            "cms.contenttypes.ui.newsitem.date",
             CmsConstants.CMS_BUNDLE),
                   "releaseDate",
                   new NewsItemDateAttributeFormatter());
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 ec2ee7c4e..4f3883494 100644
--- a/ccm-cms/src/main/java/org/librecms/contentsection/ContentItemManager.java
+++ b/ccm-cms/src/main/java/org/librecms/contentsection/ContentItemManager.java
@@ -77,7 +77,7 @@ import org.librecms.contentsection.privileges.TypePrivileges;
  *
  * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
  */
-@RequestScoped
+ @RequestScoped
 public class ContentItemManager {
 
     private static final Logger LOGGER = LogManager.getLogger(
@@ -1338,6 +1338,7 @@ public class ContentItemManager {
         final TypedQuery<ContentItem> query = entityManager.createNamedQuery(
             "ContentItem.findDraftVersion", ContentItem.class);
         query.setParameter("uuid", item.getItemUuid());
+        contentItemRepo.setAuthorizationParameters(query);
 
         return (T) query.getSingleResult();
     }
diff --git a/ccm-cms/src/main/java/org/librecms/contentsection/ContentItemRepository.java b/ccm-cms/src/main/java/org/librecms/contentsection/ContentItemRepository.java
index 29c1a1ba9..2710cfaab 100644
--- a/ccm-cms/src/main/java/org/librecms/contentsection/ContentItemRepository.java
+++ b/ccm-cms/src/main/java/org/librecms/contentsection/ContentItemRepository.java
@@ -513,7 +513,7 @@ public class ContentItemRepository
      *              boundary here to allow usage with all results type used in
      *              this class ({@link ContentItem} and sub classes ,Long)
      */
-    private void setAuthorizationParameters(final TypedQuery<?> query) {
+    protected void setAuthorizationParameters(final TypedQuery<?> query) {
 
         final Optional<User> user = shiro.getUser();
         final List<Role> roles;
diff --git a/ccm-cms/src/main/resources/org/librecms/CmsResources.properties b/ccm-cms/src/main/resources/org/librecms/CmsResources.properties
index 02606b03e..e7625af01 100644
--- a/ccm-cms/src/main/resources/org/librecms/CmsResources.properties
+++ b/ccm-cms/src/main/resources/org/librecms/CmsResources.properties
@@ -334,3 +334,5 @@ cms.ui.language.header=Language
 cms.ui.language.title=Title
 cms.ui.action=Action
 cms.ui.item.language.add=Add language
+cms.contenttypes.ui.newsitem.date=News date
+cms.contenttypes.ui.newsitem.lead=Description
diff --git a/ccm-cms/src/main/resources/org/librecms/CmsResources_de.properties b/ccm-cms/src/main/resources/org/librecms/CmsResources_de.properties
index 6805cda72..40d90e519 100644
--- a/ccm-cms/src/main/resources/org/librecms/CmsResources_de.properties
+++ b/ccm-cms/src/main/resources/org/librecms/CmsResources_de.properties
@@ -331,3 +331,5 @@ cms.ui.language.header=Sprache
 cms.ui.language.title=Titel
 cms.ui.action=Aktion
 cms.ui.item.language.add=Sprache hinzuf\u00fcgen
+cms.contenttypes.ui.newsitem.date=Datum
+cms.contenttypes.ui.newsitem.lead=Zusammenfassung
diff --git a/ccm-cms/src/main/resources/org/librecms/CmsResources_fr.properties b/ccm-cms/src/main/resources/org/librecms/CmsResources_fr.properties
index 3d919af8e..723bd9159 100644
--- a/ccm-cms/src/main/resources/org/librecms/CmsResources_fr.properties
+++ b/ccm-cms/src/main/resources/org/librecms/CmsResources_fr.properties
@@ -290,3 +290,5 @@ cms.ui.language.header=Language
 cms.ui.language.title=Title
 cms.ui.action=Action
 cms.ui.item.language.add=Add language
+cms.contenttypes.ui.newsitem.date=News date
+cms.contenttypes.ui.newsitem.lead=Description