From 2d18b5ad3eef389ea103fe02c4dc2b5f4970ea01 Mon Sep 17 00:00:00 2001 From: quasi Date: Fri, 28 Oct 2011 12:42:30 +0000 Subject: [PATCH] =?UTF-8?q?Fehler=20im=20Benachrichtigungsforumlar=20behob?= =?UTF-8?q?en=20Rechte-Fehler=20f=C3=BCr=20den=20Theme-Tab=20korrigiert?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: https://svn.libreccm.org/ccm/trunk@1212 8810af33-2d31-482b-a856-94f89814c4df --- .../arsdigita/forum/ui/ForumAlertsView.java | 16 ++++----- .../forum/ui/ForumUserCompactView.java | 36 ++++--------------- 2 files changed, 14 insertions(+), 38 deletions(-) diff --git a/ccm-forum/src/com/arsdigita/forum/ui/ForumAlertsView.java b/ccm-forum/src/com/arsdigita/forum/ui/ForumAlertsView.java index 17b072a42..018ba0c75 100755 --- a/ccm-forum/src/com/arsdigita/forum/ui/ForumAlertsView.java +++ b/ccm-forum/src/com/arsdigita/forum/ui/ForumAlertsView.java @@ -109,17 +109,17 @@ class ForumAlertsView extends SimpleContainer implements Constants { ForumSubscription fSub = ForumSubscription.getFromForum(forum); if (fSub.isSubscribed(party)) { - instant.setValue(s,"Yes"); + instant.setValue(s,Text.gzAsStr("forum.ui.yes")); } else { - instant.setValue(s, "No"); + instant.setValue(s, Text.gzAsStr("forum.ui.no")); } DailySubscription dSub = (DailySubscription) DailySubscription.getFromForum(forum); if (dSub.isSubscribed(party)) { - daily.setValue(s,"Yes"); + daily.setValue(s,Text.gzAsStr("forum.ui.yes")); } else { - daily.setValue(s, "No"); + daily.setValue(s, Text.gzAsStr("forum.ui.no")); } } }); @@ -138,9 +138,9 @@ class ForumAlertsView extends SimpleContainer implements Constants { DailySubscription dSub = (DailySubscription) DailySubscription.getFromForum(forum); - if (data.get("instant").equals("Yes")) { + if (data.get("instant").equals(Text.gzAsStr("forum.ui.yes"))) { fSub.subscribe(party); - } else if (data.get("instant").equals("No")) { + } else if (data.get("instant").equals(Text.gzAsStr("forum.ui.no"))) { fSub.unsubscribe(party); } else { throw new FormProcessException( @@ -149,9 +149,9 @@ class ForumAlertsView extends SimpleContainer implements Constants { } fSub.save(); - if (data.get("daily").equals("Yes")) { + if (data.get("daily").equals(Text.gzAsStr("forum.ui.yes"))) { dSub.subscribe(party); - } else if (data.get("daily").equals("No")) { + } else if (data.get("daily").equals(Text.gzAsStr("forum.ui.no"))) { dSub.unsubscribe(party); } else { throw new FormProcessException( diff --git a/ccm-forum/src/com/arsdigita/forum/ui/ForumUserCompactView.java b/ccm-forum/src/com/arsdigita/forum/ui/ForumUserCompactView.java index 6f990932c..2e4bcd158 100755 --- a/ccm-forum/src/com/arsdigita/forum/ui/ForumUserCompactView.java +++ b/ccm-forum/src/com/arsdigita/forum/ui/ForumUserCompactView.java @@ -193,7 +193,6 @@ public class ForumUserCompactView extends ModalContainer implements Constants { UserContext.redirectToLoginPage(state.getRequest()); } PermissionService.assertPermission(forumAdmin); - setVisibleComponent(state, m_permissionsView); } else if (MODE_SETUP.equals(mode)) { if (party == null) { @@ -202,7 +201,9 @@ public class ForumUserCompactView extends ModalContainer implements Constants { PermissionService.assertPermission(forumAdmin); setVisibleComponent(state, m_setupView); } else if (MODE_THREADS.equals(mode)) { - PermissionService.assertPermission(forumAdmin); + if (party == null) { + UserContext.redirectToLoginPage(state.getRequest()); + } setVisibleComponent(state, m_threadsView); } } @@ -247,7 +248,7 @@ public class ForumUserCompactView extends ModalContainer implements Constants { protected void generateModes(PageState state, Element content, Party party, Forum forum) { - PermissionDescriptor permission = new PermissionDescriptor( + PermissionDescriptor adminPermission = new PermissionDescriptor( PrivilegeDescriptor.ADMIN, forum, party); @@ -269,7 +270,7 @@ public class ForumUserCompactView extends ModalContainer implements Constants { Text.gz("forum.ui.modeThreads")); } } - // topics panel is always shoen as well if not restricted to admins. + // topics panel is always shown as well if not restricted to admins. if (!Forum.getConfig().topicCreationByAdminOnly()) { generateModeXML(state, content, MODE_TOPICS, Text.gz("forum.ui.modeTopics")); @@ -279,7 +280,7 @@ public class ForumUserCompactView extends ModalContainer implements Constants { Text.gz("forum.ui.modeAlerts")); // admin section - if (PermissionService.checkPermission(permission)) { + if (PermissionService.checkPermission(adminPermission)) { generateModeXML(state, content, MODE_MODERATION, Text.gz("forum.ui.modeAlerts")); if (Forum.getConfig().showNewTabs()) { @@ -313,31 +314,6 @@ public class ForumUserCompactView extends ModalContainer implements Constants { Element parent, String mode) { generateModeXML(state, parent, mode, null); - /* - String current = (String)state.getValue(m_mode); - if (current == null) { - current = MODE_THREADS; // used as default mode - } - - Element content = - parent.newChildElement(FORUM_XML_PREFIX + ":forumMode", FORUM_XML_NS); - - state.setControlEvent(this, "mode", mode); - - content.addAttribute("mode", - mode); - - try { - content.addAttribute("url", - state.stateAsURL()); - } catch (IOException ex) { - throw new UncheckedWrapperException("cannot create url", ex); - } - content.addAttribute("selected", - current.equals(mode) ? "1" : "0"); - state.clearControlEvent(); - - */ } /**