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

Fehler #2400 FormprocessException, modul ccm-forum 

git-svn-id: https://svn.libreccm.org/ccm/trunk@3126 8810af33-2d31-482b-a856-94f89814c4df
master
konermann 2015-02-09 12:01:36 +00:00
parent f16a3d3d59
commit 0eeb193d7d
9 changed files with 138 additions and 123 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ccm-core/src/com/arsdigita/ui/admin/AdminResources.properties
View File

@ -148,3 +148,5 @@ ui.admin.sysinfo.xml_document_builder=XML Document Builder
ui.admin.sysinfo.sax_parser_factory=SAX Parser Factory ui.admin.sysinfo.sax_parser_factory=SAX Parser Factory
ui.admin.sysinfo.sax_parser=SAX Parser ui.admin.sysinfo.sax_parser=SAX Parser
ui.admin.sysinfo.xml_config=XML config ui.admin.sysinfo.xml_config=XML config
#ID ist null
ui.admin.groups.ID_is_null=ID is null

2
ccm-core/src/com/arsdigita/ui/admin/AdminResources_de.properties
View File

@ -148,3 +148,5 @@ ui.admin.sysinfo.xml_document_builder=XML Document Builder
ui.admin.sysinfo.sax_parser_factory=SAX Parser Factory ui.admin.sysinfo.sax_parser_factory=SAX Parser Factory
ui.admin.sysinfo.sax_parser=SAX Parser ui.admin.sysinfo.sax_parser=SAX Parser
ui.admin.sysinfo.xml_config=XML Konfiguration ui.admin.sysinfo.xml_config=XML Konfiguration
#ID ist null
ui.admin.groups.ID_is_null=ID is null

2
ccm-core/src/com/arsdigita/ui/admin/AdminResources_en.properties
View File

@ -106,3 +106,5 @@ ui.admin.applications.ApplicationInstancePane.title.label=Title of the instance
ui.admin.applications.ApplicationInstancePane.parent_app.label=Parent application ui.admin.applications.ApplicationInstancePane.parent_app.label=Parent application
i.admin.cancel=Cancel i.admin.cancel=Cancel
ui.admin.cancel_msg=Submission cancelled ui.admin.cancel_msg=Submission cancelled
#ID ist null
ui.admin.groups.ID_is_null=

5
ccm-forum/src/com/arsdigita/forum/ForumResources.properties
View File

@ -6,6 +6,7 @@ forum.ui.receive_daily_summary=Receive daily summary
forum.ui.modeAlerts=Alerts forum.ui.modeAlerts=Alerts
forum.ui.modeThreads=Threads forum.ui.modeThreads=Threads
#Received bad option for instant:
forum.ui.modeTopics=Topics forum.ui.modeTopics=Topics
forum.ui.modeModeration=Moderation forum.ui.modeModeration=Moderation
forum.ui.modeSetup=Setup forum.ui.modeSetup=Setup
@ -66,3 +67,7 @@ forum.ui.validation.file_not_uploaded=To add the specified file, use the Add Fil
forum.ui.validation.introduction_too_long=Your introduction is too long, only 4000 characters can be stored forum.ui.validation.introduction_too_long=Your introduction is too long, only 4000 characters can be stored
forum.ui.settings.public=Forum is public forum.ui.settings.public=Forum is public
forum.ui.admin.no_settings=No settings available forum.ui.admin.no_settings=No settings available
#schlechte Option erhalten f\u00fcr:
forum.ui.alerts.received_bad_option=Received bad option for instant:
forum.ui.alerts.received_bad_option_daily=Received bad option for daily:
forum.ui.cancelled=Cancelled

4
ccm-forum/src/com/arsdigita/forum/ForumResources_de.properties
View File

@ -66,3 +66,7 @@ forum.ui.validation.file_not_uploaded=To add the specified file, use the Add Fil
forum.ui.validation.introduction_too_long=Die Einf\u00fchrung ist zu lang, maximal 4000 Zeichen sind zugelassen. forum.ui.validation.introduction_too_long=Die Einf\u00fchrung ist zu lang, maximal 4000 Zeichen sind zugelassen.
forum.ui.settings.public=Forum ist \u00f6ffentlich forum.ui.settings.public=Forum ist \u00f6ffentlich
forum.ui.admin.no_settings=Keine Einstellungen verf\u00fcgbar. forum.ui.admin.no_settings=Keine Einstellungen verf\u00fcgbar.
#schlechte Option erhalten f\u00fcr:
forum.ui.alerts.received_bad_option=Schlechte Option erhalten f\u00fcr:
forum.ui.alerts.received_bad_option_daily=Schlechte Option erhalten f\u00fcr daily:
forum.ui.cancelled=Abgebrochen

4
ccm-forum/src/com/arsdigita/forum/ForumResources_fr.properties
View File

@ -60,3 +60,7 @@ forum.ui.topics=Topics
forum.ui.thread.viewAll=View all threads forum.ui.thread.viewAll=View all threads
forum.ui.settings.public= forum.ui.settings.public=
forum.ui.admin.no_settings= forum.ui.admin.no_settings=
#schlechte Option erhalten f\u00fcr:
forum.ui.alerts.received_bad_option=Received bad option for instant:
forum.ui.alerts.received_bad_option_daily=Received bad option for daily:
forum.ui.cancelled=Cancelled

137
ccm-forum/src/com/arsdigita/forum/ui/ForumAlertsView.java
View File

@ -18,7 +18,6 @@
*/ */
package com.arsdigita.forum.ui; package com.arsdigita.forum.ui;
import com.arsdigita.forum.util.GlobalizationUtil; import com.arsdigita.forum.util.GlobalizationUtil;
import com.arsdigita.bebop.ColumnPanel; import com.arsdigita.bebop.ColumnPanel;
import com.arsdigita.bebop.Component; import com.arsdigita.bebop.Component;
@ -59,8 +58,8 @@ import org.apache.log4j.Logger;
* *
*/ */
class ForumAlertsView extends SimpleContainer implements Constants { class ForumAlertsView extends SimpleContainer implements Constants {
private static final Logger s_log = Logger.getLogger
(ForumAlertsView.class); private static final Logger s_log = Logger.getLogger(ForumAlertsView.class);
/** /**
* Standard Constructor * Standard Constructor
@ -72,14 +71,14 @@ class ForumAlertsView extends SimpleContainer implements Constants {
private Component forumAlertsSegment() { private Component forumAlertsSegment() {
SimpleContainer seg = new SimpleContainer(FORUM_XML_PREFIX + ":forumAlerts", SimpleContainer seg = new SimpleContainer(FORUM_XML_PREFIX + ":forumAlerts",
FORUM_XML_NS); FORUM_XML_NS);
seg.add(forumAlertsForm()); seg.add(forumAlertsForm());
return seg; return seg;
} }
private Component threadAlertsSegment() { private Component threadAlertsSegment() {
SimpleContainer seg = new SimpleContainer(FORUM_XML_PREFIX + ":threadAlerts", SimpleContainer seg = new SimpleContainer(FORUM_XML_PREFIX + ":threadAlerts",
FORUM_XML_NS); FORUM_XML_NS);
seg.add(threadAlertsForm()); seg.add(threadAlertsForm());
return seg; return seg;
} }
@ -103,67 +102,65 @@ class ForumAlertsView extends SimpleContainer implements Constants {
alertsForm.add(new Submit(GlobalizationUtil.gz("forum.ui.save"))); alertsForm.add(new Submit(GlobalizationUtil.gz("forum.ui.save")));
alertsForm.addInitListener(new FormInitListener() { alertsForm.addInitListener(new FormInitListener() {
public void init(FormSectionEvent e) { public void init(FormSectionEvent e) {
FormData data = e.getFormData(); FormData data = e.getFormData();
PageState s = e.getPageState(); PageState s = e.getPageState();
Party party = Kernel.getContext().getParty(); Party party = Kernel.getContext().getParty();
Forum forum = ForumContext.getContext(s).getForum(); Forum forum = ForumContext.getContext(s).getForum();
ForumSubscription fSub = ForumSubscription fSub
ForumSubscription.getFromForum(forum); = ForumSubscription.getFromForum(forum);
if (fSub.isSubscribed(party)) { if (fSub.isSubscribed(party)) {
instant.setValue(s,GlobalizationUtil.gzAsStr("forum.ui.yes")); instant.setValue(s, GlobalizationUtil.gzAsStr("forum.ui.yes"));
} else { } else {
instant.setValue(s, GlobalizationUtil.gzAsStr("forum.ui.no")); instant.setValue(s, GlobalizationUtil.gzAsStr("forum.ui.no"));
}
DailySubscription dSub = (DailySubscription)
DailySubscription.getFromForum(forum);
if (dSub.isSubscribed(party)) {
daily.setValue(s,GlobalizationUtil.gzAsStr("forum.ui.yes"));
} else {
daily.setValue(s, GlobalizationUtil.gzAsStr("forum.ui.no"));
}
} }
});
DailySubscription dSub = (DailySubscription) DailySubscription.getFromForum(forum);
if (dSub.isSubscribed(party)) {
daily.setValue(s, GlobalizationUtil.gzAsStr("forum.ui.yes"));
} else {
daily.setValue(s, GlobalizationUtil.gzAsStr("forum.ui.no"));
}
}
});
alertsForm.addProcessListener(new FormProcessListener() { alertsForm.addProcessListener(new FormProcessListener() {
public void process(FormSectionEvent e) public void process(FormSectionEvent e)
throws FormProcessException { throws FormProcessException {
FormData data = e.getFormData(); FormData data = e.getFormData();
PageState s = e.getPageState(); PageState s = e.getPageState();
Party party = Kernel.getContext().getParty(); Party party = Kernel.getContext().getParty();
Forum forum = ForumContext.getContext(s).getForum(); Forum forum = ForumContext.getContext(s).getForum();
ForumSubscription fSub = ForumSubscription fSub
ForumSubscription.getFromForum(forum); = ForumSubscription.getFromForum(forum);
DailySubscription dSub = (DailySubscription) DailySubscription dSub = (DailySubscription) DailySubscription.getFromForum(forum);
DailySubscription.getFromForum(forum);
if (data.get("instant").equals(GlobalizationUtil.gzAsStr("forum.ui.yes"))) { if (data.get("instant").equals(GlobalizationUtil.gzAsStr("forum.ui.yes"))) {
fSub.subscribe(party); fSub.subscribe(party);
} else if (data.get("instant").equals(GlobalizationUtil.gzAsStr("forum.ui.no"))) { } else if (data.get("instant").equals(GlobalizationUtil.gzAsStr("forum.ui.no"))) {
fSub.unsubscribe(party); fSub.unsubscribe(party);
} else { } else {
throw new FormProcessException( throw new FormProcessException(GlobalizationUtil.gz(
"Received bad option for instant: " "forum.ui.alerts.received_bad_option"
+ data.get("instant")); + data.get("instant")));
}
fSub.save();
if (data.get("daily").equals(GlobalizationUtil.gzAsStr("forum.ui.yes"))) {
dSub.subscribe(party);
} else if (data.get("daily").equals(GlobalizationUtil.gzAsStr("forum.ui.no"))) {
dSub.unsubscribe(party);
} else {
throw new FormProcessException(
"Received bad option for daily: "
+ data.get("daily"));
}
dSub.save();
} }
}); fSub.save();
if (data.get("daily").equals(GlobalizationUtil.gzAsStr("forum.ui.yes"))) {
dSub.subscribe(party);
} else if (data.get("daily").equals(GlobalizationUtil.gzAsStr("forum.ui.no"))) {
dSub.unsubscribe(party);
} else {
throw new FormProcessException(GlobalizationUtil.gz(
"forum.ui.alerts.received_bad_option_daily"
+ data.get("daily")));
}
dSub.save();
}
});
return alertsForm; return alertsForm;
} }
@ -171,20 +168,20 @@ class ForumAlertsView extends SimpleContainer implements Constants {
Form form = new Form("dailyAlerts"); Form form = new Form("dailyAlerts");
form.setRedirecting(true); form.setRedirecting(true);
form.add(new ThreadAlertsList() { form.add(new ThreadAlertsList() {
public Element generateAlertXML(ThreadSubscription sub) { public Element generateAlertXML(ThreadSubscription sub) {
Element subEl = super.generateAlertXML(sub); Element subEl = super.generateAlertXML(sub);
subEl.addAttribute("param", "delete"); subEl.addAttribute("param", "delete");
return subEl; return subEl;
} }
}); });
CheckboxGroup boxes = new CheckboxGroup( CheckboxGroup boxes = new CheckboxGroup(
new ArrayParameter(new BigDecimalParameter("delete"))); new ArrayParameter(new BigDecimalParameter("delete")));
form.add(boxes); form.add(boxes);
form.add(new Submit(GlobalizationUtil.gz("forum.ui.delete")), form.add(new Submit(GlobalizationUtil.gz("forum.ui.delete")),
FULL_WIDTH | RIGHT); FULL_WIDTH | RIGHT);
form.addProcessListener(new DeleteProcesser()); form.addProcessListener(new DeleteProcesser());
@ -192,19 +189,19 @@ class ForumAlertsView extends SimpleContainer implements Constants {
} }
class DeleteProcesser implements FormProcessListener { class DeleteProcesser implements FormProcessListener {
public void process(FormSectionEvent e) { public void process(FormSectionEvent e) {
FormData data = e.getFormData(); FormData data = e.getFormData();
PageState s = e.getPageState(); PageState s = e.getPageState();
Party party = Kernel.getContext().getParty(); Party party = Kernel.getContext().getParty();
BigDecimal[] deletes = (BigDecimal[]) BigDecimal[] deletes = (BigDecimal[]) data.get("delete");
data.get("delete");
if (deletes != null) { if (deletes != null) {
for (int i = 0; i < deletes.length ; i++) { for (int i = 0; i < deletes.length; i++) {
try { try {
ThreadSubscription tSub = ThreadSubscription tSub
new ThreadSubscription(deletes[i]); = new ThreadSubscription(deletes[i]);
tSub.unsubscribe(party); tSub.unsubscribe(party);
tSub.save(); tSub.save();
} catch (DataObjectNotFoundException x) { } catch (DataObjectNotFoundException x) {

2
ccm-forum/src/com/arsdigita/forum/ui/TopicAddForm.java
View File

@ -98,7 +98,7 @@ public class TopicAddForm extends Form {
PageState state = e.getPageState(); PageState state = e.getPageState();
if (cancel.isSelected(state)){ if (cancel.isSelected(state)){
fireCompletionEvent(state); fireCompletionEvent(state);
throw new FormProcessException("cancelled"); throw new FormProcessException(GlobalizationUtil.gz("forum.ui.cancelled"));
} }
} }
}); });

81
ccm-forum/src/com/arsdigita/forum/ui/admin/SetupView.java
View File

@ -51,12 +51,11 @@ import com.arsdigita.web.Application;
import org.apache.log4j.Logger; import org.apache.log4j.Logger;
/** /**
* Form that allows forum admin to set options * Form that allows forum admin to set options that apply to this forum instance
* that apply to this forum instance
*/ */
public class SetupView extends Form public class SetupView extends Form
implements FormInitListener, FormSubmissionListener, implements FormInitListener, FormSubmissionListener,
FormProcessListener, Constants { FormProcessListener, Constants {
private static final Logger s_log = Logger.getLogger(SetupView.class); private static final Logger s_log = Logger.getLogger(SetupView.class);
// values for checkboxes // values for checkboxes
@ -86,38 +85,38 @@ public class SetupView extends Form
m_settings = new CheckboxGroup("settings"); m_settings = new CheckboxGroup("settings");
m_settings.addOption(new Option(MODERATED, m_settings.addOption(new Option(MODERATED,
new Label(GlobalizationUtil.gz( new Label(GlobalizationUtil.gz(
"forum.ui.settings.moderated")) "forum.ui.settings.moderated"))
)); ));
m_settings.addOption(new Option(PUBLIC, m_settings.addOption(new Option(PUBLIC,
new Label( GlobalizationUtil.gz( new Label(GlobalizationUtil.gz(
"forum.ui.settings.public")) "forum.ui.settings.public"))
)); ));
m_settings.addOption(new Option(NOTICEBOARD, m_settings.addOption(new Option(NOTICEBOARD,
new Label(GlobalizationUtil.gz( new Label(GlobalizationUtil.gz(
"forum.ui.settings.noticeboard")) "forum.ui.settings.noticeboard"))
)); ));
m_settings.addOption(new Option(ALLOW_FILES, m_settings.addOption(new Option(ALLOW_FILES,
new Label(GlobalizationUtil.gz( new Label(GlobalizationUtil.gz(
"forum.ui.settings.allowFiles")) "forum.ui.settings.allowFiles"))
)); ));
m_settings.addOption(new Option(ALLOW_IMAGES, m_settings.addOption(new Option(ALLOW_IMAGES,
new Label(GlobalizationUtil.gz( new Label(GlobalizationUtil.gz(
"forum.ui.settings.allowImages")) "forum.ui.settings.allowImages"))
)); ));
m_settings.addOption(new Option(AUTOSUBSCRIBE_THREAD_STARTERS, m_settings.addOption(new Option(AUTOSUBSCRIBE_THREAD_STARTERS,
new Label(GlobalizationUtil.gz( new Label(GlobalizationUtil.gz(
"forum.ui.settings.autosubscribe")) "forum.ui.settings.autosubscribe"))
)); ));
m_settings.addOption(new Option(NO_CATEGORY_POSTS_ALLOWED, m_settings.addOption(new Option(NO_CATEGORY_POSTS_ALLOWED,
new Label(GlobalizationUtil.gz( new Label(GlobalizationUtil.gz(
"forum.ui.settings.noCategoryPosts")) "forum.ui.settings.noCategoryPosts"))
)); ));
m_settings.addOption(new Option(ANONYMOUS_POSTS_ALLOWED, m_settings.addOption(new Option(ANONYMOUS_POSTS_ALLOWED,
new Label(GlobalizationUtil.gz( new Label(GlobalizationUtil.gz(
"forum.ui.settings.anonymousPosts")) "forum.ui.settings.anonymousPosts"))
)); ));
// preliminary step 2: Create a widget to determin the expiration limit // preliminary step 2: Create a widget to determin the expiration limit
// for the forum GUI // for the forum GUI
@ -133,24 +132,23 @@ public class SetupView extends Form
// preliminary step 4: Create Introductory text area // preliminary step 4: Create Introductory text area
m_introduction = new TextArea("introduction", 8, 60, TextArea.SOFT); m_introduction = new TextArea("introduction", 8, 60, TextArea.SOFT);
m_introduction.addValidationListener( m_introduction.addValidationListener(
new StringInRangeValidationListener(0, 4000, new StringInRangeValidationListener(0, 4000,
GlobalizationUtil.gz( GlobalizationUtil.gz(
"forum.ui.validation.introduction_too_long") "forum.ui.validation.introduction_too_long")
)); ));
// m_introduction.setMetaDataAttribute("label", (String) GlobalizationUtil.gz( // m_introduction.setMetaDataAttribute("label", (String) GlobalizationUtil.gz(
// "forum.ui.settings.introduction").localize()); // "forum.ui.settings.introduction").localize());
m_introduction.setLabel(GlobalizationUtil.gz( m_introduction.setLabel(GlobalizationUtil.gz(
"forum.ui.settings.introduction")); "forum.ui.settings.introduction"));
// preliminary step 5: Create title text field // preliminary step 5: Create title text field
m_title = new TextField("title"); m_title = new TextField("title");
// m_title.setMetaDataAttribute("label", (String) GlobalizationUtil.gz( // m_title.setMetaDataAttribute("label", (String) GlobalizationUtil.gz(
// "forum.ui.settings.title").localize()); // "forum.ui.settings.title").localize());
m_title.setLabel(GlobalizationUtil.gz( m_title.setLabel(GlobalizationUtil.gz(
"forum.ui.settings.title")); "forum.ui.settings.title"));
m_title.setSize(70); m_title.setSize(70);
// //////////////////////////////////////////////////////////////////// // ////////////////////////////////////////////////////////////////////
// Create the pane // Create the pane
// //////////////////////////////////////////////////////////////////// // ////////////////////////////////////////////////////////////////////
@ -205,7 +203,8 @@ public class SetupView extends Form
if (m_saveCancel.getCancelButton().isSelected(state)) { if (m_saveCancel.getCancelButton().isSelected(state)) {
s_log.debug("cancelled"); s_log.debug("cancelled");
throw new FormProcessException("cancelled"); throw new FormProcessException(GlobalizationUtil.gz(
"forum.ui.cancelled"));
} }
} }