[jboss-svn-commits] JBL Code SVN: r9816 - in labs/jbossforums/branches/forums101P22: forums/src/main/org/jboss/portlet/forums/ui and 4 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Tue Feb 27 14:07:29 EST 2007
Author: unibrew
Date: 2007-02-27 14:07:29 -0500 (Tue, 27 Feb 2007)
New Revision: 9816
Modified:
labs/jbossforums/branches/forums101P22/authz-jaae-plugin/src/resources/forums-authz-plugin.sar/META-INF/acl-mapping.xml
labs/jbossforums/branches/forums101P22/forums/src/main/org/jboss/portlet/forums/ui/Constants.java
labs/jbossforums/branches/forums101P22/forums/src/main/org/jboss/portlet/forums/ui/action/AdminController.java
labs/jbossforums/branches/forums101P22/forums/src/resources/portal-forums-war/WEB-INF/classes/ResourceJSF.properties
labs/jbossforums/branches/forums101P22/forums/src/resources/portal-forums-war/views/category/viewcategory_body.xhtml
labs/jbossforums/branches/forums101P22/forums/src/resources/portal-forums-war/views/common/common.xhtml
Log:
[JBFORUMS-182] Adding funtionality to lock and unlock a forum. Additionally, small fix in CategoryView and CommonView.
Modified: labs/jbossforums/branches/forums101P22/authz-jaae-plugin/src/resources/forums-authz-plugin.sar/META-INF/acl-mapping.xml
===================================================================
--- labs/jbossforums/branches/forums101P22/authz-jaae-plugin/src/resources/forums-authz-plugin.sar/META-INF/acl-mapping.xml 2007-02-27 18:34:29 UTC (rev 9815)
+++ labs/jbossforums/branches/forums101P22/authz-jaae-plugin/src/resources/forums-authz-plugin.sar/META-INF/acl-mapping.xml 2007-02-27 19:07:29 UTC (rev 9816)
@@ -143,7 +143,27 @@
<implies>viewForum</implies>
<implies>addForum</implies>
<implies>editForum</implies>
- </function>
+ </function>
+ <function id="lockForum" name="Ability to Lock forums">
+ <!-- ui protection -->
+ <resource type="fragment">
+ <id>acl://lockForums</id>
+ </resource>
+ <!-- action protection -->
+ <resource type="jsfAction">
+ <class>org.jboss.portlet.forums.ui.action.AdminController</class>
+ <method>lockForum</method>
+ </resource>
+ <resource type="jsfAction">
+ <class>org.jboss.portlet.forums.ui.action.AdminController</class>
+ <method>unlockForum</method>
+ </resource>
+ <implies>accessAdminTool</implies>
+ <implies>viewCategory</implies>
+ <implies>viewForum</implies>
+ <implies>editForum</implies>
+ </function>
+
</module>
<!-- Message Board usecases -->
@@ -317,4 +337,4 @@
<implies>moderateForum</implies>
</function>
</module>
-</acl>
\ No newline at end of file
+</acl>
Modified: labs/jbossforums/branches/forums101P22/forums/src/main/org/jboss/portlet/forums/ui/Constants.java
===================================================================
--- labs/jbossforums/branches/forums101P22/forums/src/main/org/jboss/portlet/forums/ui/Constants.java 2007-02-27 18:34:29 UTC (rev 9815)
+++ labs/jbossforums/branches/forums101P22/forums/src/main/org/jboss/portlet/forums/ui/Constants.java 2007-02-27 19:07:29 UTC (rev 9816)
@@ -109,7 +109,12 @@
/**
* DOCUMENT_ME
*/
- public static final int FORUM_LOCKED = 1;
+ public static final int FORUM_LOCKED = 1;
+
+ /**
+ * DOCUMENT_ME
+ */
+ public static final int FORUM_UNLOCKED = 0;
/**
* DOCUMENT_ME
Modified: labs/jbossforums/branches/forums101P22/forums/src/main/org/jboss/portlet/forums/ui/action/AdminController.java
===================================================================
--- labs/jbossforums/branches/forums101P22/forums/src/main/org/jboss/portlet/forums/ui/action/AdminController.java 2007-02-27 18:34:29 UTC (rev 9815)
+++ labs/jbossforums/branches/forums101P22/forums/src/main/org/jboss/portlet/forums/ui/action/AdminController.java 2007-02-27 19:07:29 UTC (rev 9816)
@@ -621,4 +621,70 @@
}
return navState;
}
+
+ /**
+ *
+ */
+ public String lockForum() {
+ try
+ {
+ System.out.println ("BEGINING OF LOCK");
+ //get the forumId where this forum should be added
+ int forumId = -1;
+ String cour = ForumUtil.getParameter(Constants.p_forumId);
+ if(cour!=null && cour.trim().length()>0)
+ {
+ forumId = Integer.parseInt(cour);
+ }
+
+ Forum forum = BaseController.getForumsModule().findForumById(new Integer(forumId));
+ forum.setStatus(Constants.FORUM_LOCKED);
+ String message = JSFUtil.getBundleMessage("ResourceJSF","Forum_locked");
+ JSFUtil.setMessage(Constants.FEEDBACK,message);
+ System.out.println ("END OF LOCK");
+ }
+ catch(Exception e)
+ {
+ JSFUtil.handleException(e);
+ }
+ finally
+ {
+ //cleanup the state
+ this.cleanup();
+ }
+ return null;
+ }
+
+ /**
+ *
+ */
+ public String unlockForum() {
+ try
+ {
+ System.out.println ("BEGINING OF UNLOCK");
+ //get the forumId where this forum should be added
+ int forumId = -1;
+ String cour = ForumUtil.getParameter(Constants.p_forumId);
+ if(cour!=null && cour.trim().length()>0)
+ {
+ forumId = Integer.parseInt(cour);
+ }
+
+ Forum forum = BaseController.getForumsModule().findForumById(new Integer(forumId));
+ forum.setStatus(Constants.FORUM_UNLOCKED);
+ String message = JSFUtil.getBundleMessage("ResourceJSF","Forum_unlocked");
+ JSFUtil.setMessage(Constants.FEEDBACK,message);
+ System.out.println ("END OF UNLOCK");
+ }
+ catch(Exception e)
+ {
+ JSFUtil.handleException(e);
+ }
+ finally
+ {
+ //cleanup the state
+ this.cleanup();
+ }
+ return null;
+ }
}
Modified: labs/jbossforums/branches/forums101P22/forums/src/resources/portal-forums-war/WEB-INF/classes/ResourceJSF.properties
===================================================================
--- labs/jbossforums/branches/forums101P22/forums/src/resources/portal-forums-war/WEB-INF/classes/ResourceJSF.properties 2007-02-27 18:34:29 UTC (rev 9815)
+++ labs/jbossforums/branches/forums101P22/forums/src/resources/portal-forums-war/WEB-INF/classes/ResourceJSF.properties 2007-02-27 19:07:29 UTC (rev 9816)
@@ -63,6 +63,9 @@
Next=Next
Previous=Previous
Goto_page=Goto page
+Last_page=Last page
+Last=Last
+First=First
Joined=Joined
L_JOINED=Joined
IP_Address=IP Address
@@ -372,9 +375,14 @@
Rules_poll_can=You <b>can</b> create polls in this forum
Rules_poll_cannot=You <b>cannot</b> create polls in this forum
# %s replaced by a href links, do not remove!
+Forum_moderation=Forum Moderation
+Moderate=Moderate
Rules_moderate_0=You <b>can</b>
Rules_moderate_1=You <b>cannot</b>
Rules_moderate_2=moderate this forum
+Forum_administration=Forum Administration
+Forum_lock=Lock this forum
+Forum_unlock=Unlock this forum
No_topics_post_one=There are no posts in this forum.<br/><br/>Click on the <b>New Topic</b> link on this page to post one.
@@ -1612,6 +1620,8 @@
Move_contents=Move all contents to -
Forum_delete=Delete Forum
Forum_delete_explain=The form below will allow you to delete a forum (or category) and decide where you want to put all topics (or forums) it contained.
+Forum_locked=Forum locked
+Forum_unlocked=Forum unlocked
Status_locked=Locked
@@ -2007,6 +2017,10 @@
Add_forum_watch=Add a forum watch
Watch=Watch
Unwatch=Unwatch
+Subscribe_to_forum=Subscribe to forum
+Unsubscribe_from_forum=UnSubscribe from forum
+Subscribe_to_topic=Subscribe to topic
+Unsubscribe_from_topic=Unsubscribe from topic
//
// Attachment Mod Admin Language Variables
Modified: labs/jbossforums/branches/forums101P22/forums/src/resources/portal-forums-war/views/category/viewcategory_body.xhtml
===================================================================
--- labs/jbossforums/branches/forums101P22/forums/src/resources/portal-forums-war/views/category/viewcategory_body.xhtml 2007-02-27 18:34:29 UTC (rev 9815)
+++ labs/jbossforums/branches/forums101P22/forums/src/resources/portal-forums-war/views/category/viewcategory_body.xhtml 2007-02-27 19:07:29 UTC (rev 9816)
@@ -129,7 +129,7 @@
<c:choose>
<c:when test="#{category.anonymous}">
- ${forums:subString(category.forumLastPosts[forumrow.id].poster.user.userName,25)}
+ ${category.forumLastPosts[forumrow.id].poster.user.userName}
</c:when>
<c:otherwise>
Modified: labs/jbossforums/branches/forums101P22/forums/src/resources/portal-forums-war/views/common/common.xhtml
===================================================================
--- labs/jbossforums/branches/forums101P22/forums/src/resources/portal-forums-war/views/common/common.xhtml 2007-02-27 18:34:29 UTC (rev 9815)
+++ labs/jbossforums/branches/forums101P22/forums/src/resources/portal-forums-war/views/common/common.xhtml 2007-02-27 19:07:29 UTC (rev 9816)
@@ -61,8 +61,7 @@
<c:if test="#{shared.anonymous==false}">
<li>
  |  
- <h:outputLink value="#{forums:outputLink(shared.links['forumWatch'],true)}"
- styleClass="mainmenu">
+ <h:outputLink value="#{forums:outputLink(shared.links['forumWatch'],true)}">
${resource.My_Forums}
</h:outputLink>
</li>
More information about the jboss-svn-commits
mailing list