LibreCCM
/
libreccm-legacy
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fehler #2400 FormprocessException, module portalworkspace 

git-svn-id: https://svn.libreccm.org/ccm/trunk@3127 8810af33-2d31-482b-a856-94f89814c4df
master
konermann 2015-02-09 12:45:11 +00:00
parent 0eeb193d7d
commit 2f15348a94
7 changed files with 20 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ccm-portalworkspace/src/com/arsdigita/portalworkspace/WorkspaceResources.properties
View File

@ -33,3 +33,5 @@ cw.workspace.default_layout=Layout
cw.workspace.ui.categorized.create_workspace.info=Currently there is no Portal Workspace for this category. If you want to create one now, please click the link below.
cw.workspace.ui.categorized.create_workspace.link=Create PortalWorkspace for this category
cw.workspace.ui.categorized.workspace.add_row.link=Add new row
portal.ui.cancelled=Cancelled
portal.ui.skip=Skip

2
ccm-portalworkspace/src/com/arsdigita/portalworkspace/WorkspaceResources_de.properties
View File

@ -33,3 +33,5 @@ cw.workspace.default_layout=Layout
cw.workspace.ui.categorized.create_workspace.info=Es gibt noch keinen Portal Workspace f\u00fcr diese Kategorie. Wenn Sie jetzt einen neuen Workspace f\u00fcr diese Kategorie anlegen m\u00f6chten klicken Sie bitte auf untenstehenden Link.
cw.workspace.ui.categorized.create_workspace.link=PortalWorkspace f\u00fcr diese Kategorie anlegen
cw.workspace.ui.categorized.workspace.add_row.link=Weitere Zeile hinzuf\u00fcgen
portal.ui.cancelled=Abgebrochen
portal.ui.skip=\u00dcberspringen

2
ccm-portalworkspace/src/com/arsdigita/portalworkspace/WorkspaceResources_en.properties
View File

@ -33,3 +33,5 @@ cw.workspace.default_layout=Layout
cw.workspace.ui.categorized.create_workspace.info=Currently there is no Portal Workspace for this category. If you want to create one now, please click the link below.
cw.workspace.ui.categorized.create_workspace.link=Create PortalWorkspace for this category
cw.workspace.ui.categorized.workspace.add_row.link=Add new row
portal.ui.cancelled=Cancelled
portal.ui.skip=Skip

2
ccm-portalworkspace/src/com/arsdigita/portalworkspace/WorkspaceResources_fr.properties
View File

@ -33,3 +33,5 @@ cw.workspace.default_layout=Layout
cw.workspace.ui.categorized.create_workspace.info=Currently there is no Portal Workspace for this category. If you want to create one now, please click the link below.
cw.workspace.ui.categorized.create_workspace.link=Create PortalWorkspace for this category
cw.workspace.ui.categorized.workspace.add_row.link=Add new row
portal.ui.cancelled=Cancelled
portal.ui.skip=Skip

4
ccm-portalworkspace/src/com/arsdigita/portalworkspace/ui/ApplicationSelector.java
View File

@ -30,6 +30,7 @@ import com.arsdigita.bebop.form.Option;
import com.arsdigita.bebop.FormProcessException;
import com.arsdigita.bebop.SaveCancelSection;
import com.arsdigita.bebop.SimpleContainer;
import com.arsdigita.cms.util.GlobalizationUtil;
import com.arsdigita.kernel.Kernel;
import com.arsdigita.kernel.Party;
import com.arsdigita.kernel.permissions.PermissionService;
@ -40,6 +41,7 @@ import com.arsdigita.web.Application;
import com.arsdigita.web.ApplicationCollection;
import com.arsdigita.london.util.ui.parameters.DomainObjectParameter;
import com.arsdigita.portalworkspace.util.GlobalizationUtil;
import java.util.TooManyListenersException;
@ -114,7 +116,7 @@ public class ApplicationSelector extends Form {
if (m_buttons.getCancelButton().isSelected(e.getPageState())) {
s_log.debug("Firing event for cancel");
fireCompletionEvent(e.getPageState());
throw new FormProcessException("canncelled");
throw new FormProcessException(GlobalizationUtil.globalize("portal.ui.cancelled"));
}
s_log.debug("Falling through for process");
}

3
ccm-portalworkspace/src/com/arsdigita/portalworkspace/ui/admin/WorkspaceCreateForm.java
View File

@ -35,6 +35,7 @@ import com.arsdigita.globalization.GlobalizedMessage;
import com.arsdigita.persistence.OID;
import com.arsdigita.portalworkspace.PageLayout;
import com.arsdigita.portalworkspace.Workspace;
import com.arsdigita.portalworkspace.util.GlobalizationUtil;
import com.arsdigita.toolbox.ui.OIDParameter;
import com.arsdigita.ui.admin.applications.ApplicationCreateForm;
import com.arsdigita.util.UncheckedWrapperException;
@ -92,7 +93,7 @@ public class WorkspaceCreateForm extends ApplicationCreateForm<Workspace> {
if (getSaveCancelSection().getCancelButton().isSelected(state)) {
layout.setValue(state, "");
throw new FormProcessException("Canceled");
throw new FormProcessException(GlobalizationUtil.globalize("portal.ui.cancelled"));
}
}

9
ccm-portalworkspace/src/com/arsdigita/portalworkspace/ui/portlet/RSSFeedPortletEditor.java
View File

@ -29,6 +29,7 @@ import com.arsdigita.bebop.event.FormSubmissionListener;
import com.arsdigita.kernel.Resource;
import com.arsdigita.kernel.ResourceType;
import com.arsdigita.kernel.ui.ResourceConfigComponent;
import com.arsdigita.portalworkspace.util.GlobalizationUtil;
public class RSSFeedPortletEditor extends ResourceConfigComponent {
@ -83,11 +84,15 @@ public class RSSFeedPortletEditor extends ResourceConfigComponent {
if (m_buttons.getCancelButton().isSelected(state)) {
fireCompletionEvent(state);
throw new FormProcessException("cancelled");
throw new FormProcessException(
GlobalizationUtil.globalize(
"portal.ui.cancelled"));
} else if (m_section.isBrowsePressed(state)) {
m_form.setVisible(state, false);
m_browser.setVisible(state, true);
throw new FormProcessException("skip");
throw new FormProcessException(
GlobalizationUtil.globalize(
"portal.ui.skip"));
}
}
});