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=SAX Parser
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=SAX Parser
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
i.admin.cancel=Cancel
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.modeThreads=Threads
#Received bad option for instant:
forum.ui.modeTopics=Topics
forum.ui.modeModeration=Moderation
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.settings.public=Forum is public
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.settings.public=Forum ist \u00f6ffentlich
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.settings.public=
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

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

@ -18,7 +18,6 @@
*/
package com.arsdigita.forum.ui;
import com.arsdigita.forum.util.GlobalizationUtil;
import com.arsdigita.bebop.ColumnPanel;
import com.arsdigita.bebop.Component;
@ -59,8 +58,8 @@ import org.apache.log4j.Logger;
*
*/
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
@ -109,18 +108,17 @@ class ForumAlertsView extends SimpleContainer implements Constants {
Party party = Kernel.getContext().getParty();
Forum forum = ForumContext.getContext(s).getForum();
ForumSubscription fSub =
ForumSubscription.getFromForum(forum);
ForumSubscription fSub
= ForumSubscription.getFromForum(forum);
if (fSub.isSubscribed(party)) {
instant.setValue(s,GlobalizationUtil.gzAsStr("forum.ui.yes"));
instant.setValue(s, GlobalizationUtil.gzAsStr("forum.ui.yes"));
} else {
instant.setValue(s, GlobalizationUtil.gzAsStr("forum.ui.no"));
}
DailySubscription dSub = (DailySubscription)
DailySubscription.getFromForum(forum);
DailySubscription dSub = (DailySubscription) DailySubscription.getFromForum(forum);
if (dSub.isSubscribed(party)) {
daily.setValue(s,GlobalizationUtil.gzAsStr("forum.ui.yes"));
daily.setValue(s, GlobalizationUtil.gzAsStr("forum.ui.yes"));
} else {
daily.setValue(s, GlobalizationUtil.gzAsStr("forum.ui.no"));
}
@ -136,19 +134,18 @@ class ForumAlertsView extends SimpleContainer implements Constants {
Party party = Kernel.getContext().getParty();
Forum forum = ForumContext.getContext(s).getForum();
ForumSubscription fSub =
ForumSubscription.getFromForum(forum);
DailySubscription dSub = (DailySubscription)
DailySubscription.getFromForum(forum);
ForumSubscription fSub
= ForumSubscription.getFromForum(forum);
DailySubscription dSub = (DailySubscription) DailySubscription.getFromForum(forum);
if (data.get("instant").equals(GlobalizationUtil.gzAsStr("forum.ui.yes"))) {
fSub.subscribe(party);
} else if (data.get("instant").equals(GlobalizationUtil.gzAsStr("forum.ui.no"))) {
fSub.unsubscribe(party);
} else {
throw new FormProcessException(
"Received bad option for instant: "
+ data.get("instant"));
throw new FormProcessException(GlobalizationUtil.gz(
"forum.ui.alerts.received_bad_option"
+ data.get("instant")));
}
fSub.save();
@ -157,9 +154,9 @@ class ForumAlertsView extends SimpleContainer implements Constants {
} 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"));
throw new FormProcessException(GlobalizationUtil.gz(
"forum.ui.alerts.received_bad_option_daily"
+ data.get("daily")));
}
dSub.save();
}
@ -192,19 +189,19 @@ class ForumAlertsView extends SimpleContainer implements Constants {
}
class DeleteProcesser implements FormProcessListener {
public void process(FormSectionEvent e) {
FormData data = e.getFormData();
PageState s = e.getPageState();
Party party = Kernel.getContext().getParty();
BigDecimal[] deletes = (BigDecimal[])
data.get("delete");
BigDecimal[] deletes = (BigDecimal[]) data.get("delete");
if (deletes != null) {
for (int i = 0; i < deletes.length ; i++) {
for (int i = 0; i < deletes.length; i++) {
try {
ThreadSubscription tSub =
new ThreadSubscription(deletes[i]);
ThreadSubscription tSub
= new ThreadSubscription(deletes[i]);
tSub.unsubscribe(party);
tSub.save();
} 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();
if (cancel.isSelected(state)){
fireCompletionEvent(state);
throw new FormProcessException("cancelled");
throw new FormProcessException(GlobalizationUtil.gz("forum.ui.cancelled"));
}
}
});

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

@ -51,8 +51,7 @@ import com.arsdigita.web.Application;
import org.apache.log4j.Logger;
/**
* Form that allows forum admin to set options
* that apply to this forum instance
* Form that allows forum admin to set options that apply to this forum instance
*/
public class SetupView extends Form
implements FormInitListener, FormSubmissionListener,
@ -90,7 +89,7 @@ public class SetupView extends Form
"forum.ui.settings.moderated"))
));
m_settings.addOption(new Option(PUBLIC,
new Label( GlobalizationUtil.gz(
new Label(GlobalizationUtil.gz(
"forum.ui.settings.public"))
));
m_settings.addOption(new Option(NOTICEBOARD,
@ -150,7 +149,6 @@ public class SetupView extends Form
"forum.ui.settings.title"));
m_title.setSize(70);
// ////////////////////////////////////////////////////////////////////
// Create the pane
// ////////////////////////////////////////////////////////////////////
@ -205,7 +203,8 @@ public class SetupView extends Form
if (m_saveCancel.getCancelButton().isSelected(state)) {
s_log.debug("cancelled");
throw new FormProcessException("cancelled");
throw new FormProcessException(GlobalizationUtil.gz(
"forum.ui.cancelled"));
}
}