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

CCM NG: Nach dem Publizieren wird zum Content Center weitergeleitet (#2798): Code für Weiterleitung entfernt/auskommentiert 

git-svn-id: https://svn.libreccm.org/ccm/ccm_ng@5290 8810af33-2d31-482b-a856-94f89814c4df
pull/2/head
jensp 2018-02-17 10:51:23 +00:00
parent c495844883
commit 32e886d287
4 changed files with 47 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
ccm-cms/src/main/java/com/arsdigita/cms/ui/lifecycle/ItemLifecycleItemPane.java
View File

@ -62,7 +62,6 @@ import org.libreccm.security.PermissionChecker;
import org.libreccm.security.Shiro; import org.libreccm.security.Shiro;
import org.libreccm.security.User; import org.libreccm.security.User;
import org.libreccm.security.UserRepository; import org.libreccm.security.UserRepository;
import org.libreccm.workflow.WorkflowManager;
import org.librecms.CmsConstants; import org.librecms.CmsConstants;
import org.librecms.contentsection.ContentItem; import org.librecms.contentsection.ContentItem;
import org.librecms.contentsection.ContentItemManager; import org.librecms.contentsection.ContentItemManager;
@ -262,7 +261,7 @@ class ItemLifecycleItemPane extends BaseItemPane {
UnpublishLink() { UnpublishLink() {
super(new Label(gz("cms.ui.item.lifecycle.unpublish"))); super(new Label(gz("cms.ui.item.lifecycle.unpublish")));
addActionListener(new Listener()); super.addActionListener(new Listener());
} }
private class Listener implements ActionListener { private class Listener implements ActionListener {
@ -306,7 +305,7 @@ class ItemLifecycleItemPane extends BaseItemPane {
RepublishLink() { RepublishLink() {
super(new Label(gz("cms.ui.item.lifecycle.republish"))); super(new Label(gz("cms.ui.item.lifecycle.republish")));
addActionListener(new Listener()); super.addActionListener(new Listener());
} }
private class Listener implements ActionListener { private class Listener implements ActionListener {
@ -404,12 +403,12 @@ class ItemLifecycleItemPane extends BaseItemPane {
*/ */
} else { } else {
republish(item, false, user); republish(item, false, user);
if (CMSConfig.getConfig().isUseStreamlinedCreation()) { // if (CMSConfig.getConfig().isUseStreamlinedCreation()) {
throw new RedirectSignal( // throw new RedirectSignal(
URL.there(state.getRequest(), // URL.there(state.getRequest(),
CmsConstants.CONTENT_CENTER_URL), // CmsConstants.CONTENT_CENTER_URL),
true); // true);
} // }
} }
} }
@ -449,7 +448,7 @@ class ItemLifecycleItemPane extends BaseItemPane {
RepublishAndResetLink() { RepublishAndResetLink() {
super(new Label(gz("cms.ui.item.lifecycle.republish_and_reset"))); 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 // warning gets a bit annoying, and link should be descriptive
// enough that it is not required // enough that it is not required
// setConfirmation("This will reset all your publication dates, are // setConfirmation("This will reset all your publication dates, are
@ -550,12 +549,12 @@ class ItemLifecycleItemPane extends BaseItemPane {
* jensp 2011-12-14 end * jensp 2011-12-14 end
*/ */
republish(item, true, user); republish(item, true, user);
if (CMSConfig.getConfig().isUseStreamlinedCreation()) { // if (CMSConfig.getConfig().isUseStreamlinedCreation()) {
throw new RedirectSignal( // throw new RedirectSignal(
URL.there(state.getRequest(), // URL.there(state.getRequest(),
CmsConstants.CONTENT_CENTER_URL), // CmsConstants.CONTENT_CENTER_URL),
true); // true);
} // }
} }
} }
@ -644,11 +643,15 @@ class ItemLifecycleItemPane extends BaseItemPane {
actionSelect.addOption(new Option( actionSelect.addOption(new Option(
REPUBLISH, 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()) { if (!CMSConfig.getConfig().isHideResetLifecycleLink()) {
actionSelect.addOption(new Option( actionSelect.addOption(new Option(
REPUBLISH_AND_RESET, 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( actionSelect.addOption(new Option(
UNPUBLISH, UNPUBLISH,
@ -785,11 +788,11 @@ class ItemLifecycleItemPane extends BaseItemPane {
} else { } else {
republish(item, false, user); republish(item, false, user);
if (CMSConfig.getConfig().isUseStreamlinedCreation()) { // if (CMSConfig.getConfig().isUseStreamlinedCreation()) {
throw new RedirectSignal( // throw new RedirectSignal(
URL.there(state.getRequest(), // URL.there(state.getRequest(),
CmsConstants.CONTENT_CENTER_URL), true); // CmsConstants.CONTENT_CENTER_URL), true);
} // }
} }
} else if (REPUBLISH_AND_RESET.equals(selected)) { } else if (REPUBLISH_AND_RESET.equals(selected)) {
if (CMSConfig.getConfig().isThreadPublishing()) { if (CMSConfig.getConfig().isThreadPublishing()) {
@ -873,11 +876,11 @@ class ItemLifecycleItemPane extends BaseItemPane {
} else { } else {
republish(item, true, user); republish(item, true, user);
if (CMSConfig.getConfig().isUseStreamlinedCreation()) { // if (CMSConfig.getConfig().isUseStreamlinedCreation()) {
throw new RedirectSignal( // throw new RedirectSignal(
URL.there(state.getRequest(), // URL.there(state.getRequest(),
CmsConstants.CONTENT_CENTER_URL), true); // CmsConstants.CONTENT_CENTER_URL), true);
} // }
} }
} else if (UNPUBLISH.equals(selected)) { } else if (UNPUBLISH.equals(selected)) {
final ContentItemManager itemManager = cdiUtil.findBean( final ContentItemManager itemManager = cdiUtil.findBean(

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

@ -514,3 +514,8 @@ cms.ui.search_prompt=Search to add new members
cms.ui.matches=Matches cms.ui.matches=Matches
cms.ui.there_was_no_one_matching_the_search_criteria=There not no one matching the search criteria 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.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

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

@ -511,3 +511,8 @@ cms.ui.search_prompt=Suche um neue Mitglieder zu erg\u00e4nzen
cms.ui.matches=Treffer cms.ui.matches=Treffer
cms.ui.there_was_no_one_matching_the_search_criteria=Keine Element erf\u00fcllt die Suchkritieren 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.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

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

@ -473,3 +473,8 @@ cms.ui.search_prompt=Search to add new members
cms.ui.matches=Matches cms.ui.matches=Matches
cms.ui.there_was_no_one_matching_the_search_criteria=There not no one matching the search criteria 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.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