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

Former-commit-id: 75ea524c0d

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());

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();
     }

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;

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

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

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