From a324a30b800e37f112e3c54ad06bc459e43c8c68 Mon Sep 17 00:00:00 2001 From: jensp Date: Sat, 17 Feb 2018 10:51:23 +0000 Subject: [PATCH] =?UTF-8?q?CCM=20NG:=20Nach=20dem=20Publizieren=20wird=20z?= =?UTF-8?q?um=20Content=20Center=20weitergeleitet=20(#2798):=20Code=20f?= =?UTF-8?q?=C3=BCr=20Weiterleitung=20entfernt/auskommentiert?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: https://svn.libreccm.org/ccm/ccm_ng@5290 8810af33-2d31-482b-a856-94f89814c4df --- .../ui/lifecycle/ItemLifecycleItemPane.java | 61 ++++++++++--------- .../org/librecms/CmsResources.properties | 5 ++ .../org/librecms/CmsResources_de.properties | 5 ++ .../org/librecms/CmsResources_fr.properties | 5 ++ 4 files changed, 47 insertions(+), 29 deletions(-) diff --git a/ccm-cms/src/main/java/com/arsdigita/cms/ui/lifecycle/ItemLifecycleItemPane.java b/ccm-cms/src/main/java/com/arsdigita/cms/ui/lifecycle/ItemLifecycleItemPane.java index 6276d455b..84793bf5b 100755 --- a/ccm-cms/src/main/java/com/arsdigita/cms/ui/lifecycle/ItemLifecycleItemPane.java +++ b/ccm-cms/src/main/java/com/arsdigita/cms/ui/lifecycle/ItemLifecycleItemPane.java @@ -62,7 +62,6 @@ import org.libreccm.security.PermissionChecker; import org.libreccm.security.Shiro; import org.libreccm.security.User; import org.libreccm.security.UserRepository; -import org.libreccm.workflow.WorkflowManager; import org.librecms.CmsConstants; import org.librecms.contentsection.ContentItem; import org.librecms.contentsection.ContentItemManager; @@ -262,7 +261,7 @@ class ItemLifecycleItemPane extends BaseItemPane { UnpublishLink() { super(new Label(gz("cms.ui.item.lifecycle.unpublish"))); - addActionListener(new Listener()); + super.addActionListener(new Listener()); } private class Listener implements ActionListener { @@ -297,7 +296,7 @@ class ItemLifecycleItemPane extends BaseItemPane { final CdiUtil cdiUtil = CdiUtil.createCdiUtil(); final ItemLifecycleAdminController controller = cdiUtil .findBean(ItemLifecycleAdminController.class); - + controller.repulish(item); } @@ -306,7 +305,7 @@ class ItemLifecycleItemPane extends BaseItemPane { RepublishLink() { super(new Label(gz("cms.ui.item.lifecycle.republish"))); - addActionListener(new Listener()); + super.addActionListener(new Listener()); } private class Listener implements ActionListener { @@ -404,12 +403,12 @@ class ItemLifecycleItemPane extends BaseItemPane { */ } else { republish(item, false, user); - if (CMSConfig.getConfig().isUseStreamlinedCreation()) { - throw new RedirectSignal( - URL.there(state.getRequest(), - CmsConstants.CONTENT_CENTER_URL), - true); - } +// if (CMSConfig.getConfig().isUseStreamlinedCreation()) { +// throw new RedirectSignal( +// URL.there(state.getRequest(), +// CmsConstants.CONTENT_CENTER_URL), +// true); +// } } } @@ -449,7 +448,7 @@ class ItemLifecycleItemPane extends BaseItemPane { RepublishAndResetLink() { super(new Label(gz("cms.ui.item.lifecycle.republish_and_reset"))); - addActionListener(new Listener()); + super.addActionListener(new Listener()); // warning gets a bit annoying, and link should be descriptive // enough that it is not required // setConfirmation("This will reset all your publication dates, are @@ -550,12 +549,12 @@ class ItemLifecycleItemPane extends BaseItemPane { * jensp 2011-12-14 end */ republish(item, true, user); - if (CMSConfig.getConfig().isUseStreamlinedCreation()) { - throw new RedirectSignal( - URL.there(state.getRequest(), - CmsConstants.CONTENT_CENTER_URL), - true); - } +// if (CMSConfig.getConfig().isUseStreamlinedCreation()) { +// throw new RedirectSignal( +// URL.there(state.getRequest(), +// CmsConstants.CONTENT_CENTER_URL), +// true); +// } } } @@ -644,11 +643,15 @@ class ItemLifecycleItemPane extends BaseItemPane { actionSelect.addOption(new Option( REPUBLISH, - new Label(gz("cms.ui.item.lifecycle.republish")))); + new Label(new GlobalizedMessage( + "cms.ui.item.lifecycle.republish", + CmsConstants.CMS_BUNDLE)))); if (!CMSConfig.getConfig().isHideResetLifecycleLink()) { actionSelect.addOption(new Option( REPUBLISH_AND_RESET, - new Label(gz("cms.ui.item.lifecycle.republish_and_reset")))); + new Label(new GlobalizedMessage( + "cms.ui.item.lifecycle.republish_and_reset", + CmsConstants.CMS_BUNDLE)))); } actionSelect.addOption(new Option( UNPUBLISH, @@ -785,11 +788,11 @@ class ItemLifecycleItemPane extends BaseItemPane { } else { republish(item, false, user); - if (CMSConfig.getConfig().isUseStreamlinedCreation()) { - throw new RedirectSignal( - URL.there(state.getRequest(), - CmsConstants.CONTENT_CENTER_URL), true); - } +// if (CMSConfig.getConfig().isUseStreamlinedCreation()) { +// throw new RedirectSignal( +// URL.there(state.getRequest(), +// CmsConstants.CONTENT_CENTER_URL), true); +// } } } else if (REPUBLISH_AND_RESET.equals(selected)) { if (CMSConfig.getConfig().isThreadPublishing()) { @@ -873,11 +876,11 @@ class ItemLifecycleItemPane extends BaseItemPane { } else { republish(item, true, user); - if (CMSConfig.getConfig().isUseStreamlinedCreation()) { - throw new RedirectSignal( - URL.there(state.getRequest(), - CmsConstants.CONTENT_CENTER_URL), true); - } +// if (CMSConfig.getConfig().isUseStreamlinedCreation()) { +// throw new RedirectSignal( +// URL.there(state.getRequest(), +// CmsConstants.CONTENT_CENTER_URL), true); +// } } } else if (UNPUBLISH.equals(selected)) { final ContentItemManager itemManager = cdiUtil.findBean( diff --git a/ccm-cms/src/main/resources/org/librecms/CmsResources.properties b/ccm-cms/src/main/resources/org/librecms/CmsResources.properties index 204ea6ce0..429d41978 100644 --- a/ccm-cms/src/main/resources/org/librecms/CmsResources.properties +++ b/ccm-cms/src/main/resources/org/librecms/CmsResources.properties @@ -514,3 +514,8 @@ cms.ui.search_prompt=Search to add new members cms.ui.matches=Matches cms.ui.there_was_no_one_matching_the_search_criteria=There not no one matching the search criteria cms.ui.party_add_form.hint=Check the box next to the name of the person(s) to assign to this role. +cms.ui.lifecycle.details.last_published=Last published +cms.ui.item.lifecycle.republish=Republish +cms.ui.item.lifecycle.unpublish=Unpublish +cms.ui.item.lifecycle.do=Do +cms.ui.item.lifecycle.republish_and_reset=Republish and reset lifecycle 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 259bb2485..f2c2173cb 100644 --- a/ccm-cms/src/main/resources/org/librecms/CmsResources_de.properties +++ b/ccm-cms/src/main/resources/org/librecms/CmsResources_de.properties @@ -511,3 +511,8 @@ cms.ui.search_prompt=Suche um neue Mitglieder zu erg\u00e4nzen cms.ui.matches=Treffer cms.ui.there_was_no_one_matching_the_search_criteria=Keine Element erf\u00fcllt die Suchkritieren cms.ui.party_add_form.hint=Aktivieren Sie die Checkbox vor dem Namen, um die Person oder Gruppe der Rolle hinzuzuf\u00fcgen +cms.ui.lifecycle.details.last_published=Zuletzt publiziert +cms.ui.item.lifecycle.republish=Erneut publizieren +cms.ui.item.lifecycle.unpublish=Depublizieren +cms.ui.item.lifecycle.do=Ausf\u00fchren +cms.ui.item.lifecycle.republish_and_reset=Erneut publizieren und Lebenszyklus zur\u00fccksetzen 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 6e7ebcf83..29fa1f682 100644 --- a/ccm-cms/src/main/resources/org/librecms/CmsResources_fr.properties +++ b/ccm-cms/src/main/resources/org/librecms/CmsResources_fr.properties @@ -473,3 +473,8 @@ cms.ui.search_prompt=Search to add new members cms.ui.matches=Matches cms.ui.there_was_no_one_matching_the_search_criteria=There not no one matching the search criteria cms.ui.party_add_form.hint=Check the box next to the name of the person(s) to assign to this role. +cms.ui.lifecycle.details.last_published=Last published +cms.ui.item.lifecycle.republish=Republish +cms.ui.item.lifecycle.unpublish=Unpublish +cms.ui.item.lifecycle.do=Do +cms.ui.item.lifecycle.republish_and_reset=Republish and reset lifecycle