LibreCCM
/
libreccm
3
0
Fork 0
Code Issues 10 Pull Requests Packages Releases Wiki Activity

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
pull/2/head
jensp 2017-07-04 12:47:08 +00:00
parent 082ca15dab
commit eb4f71cba2
6 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ccm-cms/src/main/java/com/arsdigita/cms/contenttypes/ui/NewsPropertiesStep.java
View File

@ -116,11 +116,11 @@ public class NewsPropertiesStep extends SimpleEditStep {
"name"); "name");
sheet.add(new GlobalizedMessage("cms.contenttypes.ui.newsitem.lead", sheet.add(new GlobalizedMessage("cms.contenttypes.ui.newsitem.lead",
CmsConstants.CMS_BUNDLE), CmsConstants.CMS_BUNDLE),
"lead"); "description");
// Show news item on homepage? // Show news item on homepage?
sheet.add(new GlobalizedMessage( sheet.add(new GlobalizedMessage(
"cms.contenttypes.ui.newsitem.news_date", "cms.contenttypes.ui.newsitem.date",
CmsConstants.CMS_BUNDLE), CmsConstants.CMS_BUNDLE),
"releaseDate", "releaseDate",
new NewsItemDateAttributeFormatter()); new NewsItemDateAttributeFormatter());

1
ccm-cms/src/main/java/org/librecms/contentsection/ContentItemManager.java
View File

@ -1338,6 +1338,7 @@ public class ContentItemManager {
final TypedQuery<ContentItem> query = entityManager.createNamedQuery( final TypedQuery<ContentItem> query = entityManager.createNamedQuery(
"ContentItem.findDraftVersion", ContentItem.class); "ContentItem.findDraftVersion", ContentItem.class);
query.setParameter("uuid", item.getItemUuid()); query.setParameter("uuid", item.getItemUuid());
contentItemRepo.setAuthorizationParameters(query);
return (T) query.getSingleResult(); return (T) query.getSingleResult();
} }

2
ccm-cms/src/main/java/org/librecms/contentsection/ContentItemRepository.java
View File

@ -513,7 +513,7 @@ public class ContentItemRepository
* boundary here to allow usage with all results type used in * boundary here to allow usage with all results type used in
* this class ({@link ContentItem} and sub classes ,Long) * 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 Optional<User> user = shiro.getUser();
final List<Role> roles; final List<Role> roles;

2
ccm-cms/src/main/resources/org/librecms/CmsResources.properties
View File

@ -334,3 +334,5 @@ cms.ui.language.header=Language
cms.ui.language.title=Title cms.ui.language.title=Title
cms.ui.action=Action cms.ui.action=Action
cms.ui.item.language.add=Add language cms.ui.item.language.add=Add language
cms.contenttypes.ui.newsitem.date=News date
cms.contenttypes.ui.newsitem.lead=Description

2
ccm-cms/src/main/resources/org/librecms/CmsResources_de.properties
View File

@ -331,3 +331,5 @@ cms.ui.language.header=Sprache
cms.ui.language.title=Titel cms.ui.language.title=Titel
cms.ui.action=Aktion cms.ui.action=Aktion
cms.ui.item.language.add=Sprache hinzuf\u00fcgen cms.ui.item.language.add=Sprache hinzuf\u00fcgen
cms.contenttypes.ui.newsitem.date=Datum
cms.contenttypes.ui.newsitem.lead=Zusammenfassung

2
ccm-cms/src/main/resources/org/librecms/CmsResources_fr.properties
View File

@ -290,3 +290,5 @@ cms.ui.language.header=Language
cms.ui.language.title=Title cms.ui.language.title=Title
cms.ui.action=Action cms.ui.action=Action
cms.ui.item.language.add=Add language cms.ui.item.language.add=Add language
cms.contenttypes.ui.newsitem.date=News date
cms.contenttypes.ui.newsitem.lead=Description