[jboss-svn-commits] JBL Code SVN: r8826 - in labs/jbossforums/branches/forums22/forums/src: main/org/jboss/portlet/forums/model and 3 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Thu Jan 11 11:07:12 EST 2007
Author: unibrew
Date: 2007-01-11 11:07:06 -0500 (Thu, 11 Jan 2007)
New Revision: 8826
Modified:
labs/jbossforums/branches/forums22/forums/src/main/org/jboss/portlet/forums/impl/ForumImpl.java
labs/jbossforums/branches/forums22/forums/src/main/org/jboss/portlet/forums/model/Forum.java
labs/jbossforums/branches/forums22/forums/src/main/org/jboss/portlet/forums/ui/action/AdminController.java
labs/jbossforums/branches/forums22/forums/src/resources/portal-forums-war/WEB-INF/classes/ResourceJSF.properties
labs/jbossforums/branches/forums22/forums/src/resources/portal-forums-war/views/admin/deleteCategory.xhtml
labs/jbossforums/branches/forums22/forums/src/resources/portal-forums-war/views/admin/deleteForum.xhtml
Log:
[JBFORUMS-157] Now deleting last category is possible and doesn't cause exception. Plus I made two other trivial bugfixes.
Modified: labs/jbossforums/branches/forums22/forums/src/main/org/jboss/portlet/forums/impl/ForumImpl.java
===================================================================
--- labs/jbossforums/branches/forums22/forums/src/main/org/jboss/portlet/forums/impl/ForumImpl.java 2007-01-11 16:06:51 UTC (rev 8825)
+++ labs/jbossforums/branches/forums22/forums/src/main/org/jboss/portlet/forums/impl/ForumImpl.java 2007-01-11 16:07:06 UTC (rev 8826)
@@ -164,10 +164,10 @@
*
* @param lastPost DOCUMENT_ME
*/
- /*public void setLastPost(Post lastPost)
+ public void setLastPost(Post lastPost)
{
//this.lastPost = lastPost;
- }*/
+ }
/**
* @hibernate.property column="jbp_name"
Modified: labs/jbossforums/branches/forums22/forums/src/main/org/jboss/portlet/forums/model/Forum.java
===================================================================
--- labs/jbossforums/branches/forums22/forums/src/main/org/jboss/portlet/forums/model/Forum.java 2007-01-11 16:06:51 UTC (rev 8825)
+++ labs/jbossforums/branches/forums22/forums/src/main/org/jboss/portlet/forums/model/Forum.java 2007-01-11 16:07:06 UTC (rev 8826)
@@ -69,7 +69,7 @@
*
* @param lastpost DOCUMENT_ME
*/
- //void setLastPost(Post lastpost);
+ void setLastPost(Post lastpost);
/**
* DOCUMENT_ME
Modified: labs/jbossforums/branches/forums22/forums/src/main/org/jboss/portlet/forums/ui/action/AdminController.java
===================================================================
--- labs/jbossforums/branches/forums22/forums/src/main/org/jboss/portlet/forums/ui/action/AdminController.java 2007-01-11 16:06:51 UTC (rev 8825)
+++ labs/jbossforums/branches/forums22/forums/src/main/org/jboss/portlet/forums/ui/action/AdminController.java 2007-01-11 16:07:06 UTC (rev 8826)
@@ -23,7 +23,6 @@
import java.util.ArrayList;
import java.util.Iterator;
-import java.util.Collection;
import org.jboss.portal.core.modules.ModuleException;
import org.jboss.portlet.forums.ui.*;
@@ -302,11 +301,16 @@
//grab the category from the module and set the title
Category source = BaseController.getForumsModule().findCategoryById(new Integer(categoryId));
- Category target = BaseController.getForumsModule().findCategoryById(new Integer(this.selectedCategory));
-
- //move all the forums from source category to the selected target category
- BaseController.getForumsModule().addAllForums(source,target);
+ if (this.selectedCategory!=-1) {
+
+ Category target = BaseController.getForumsModule().findCategoryById(new Integer(this.selectedCategory));
+
+ //move all the forums from source category to the selected target category
+ BaseController.getForumsModule().addAllForums(source,target);
+
+ }
+
//remove the source category
BaseController.getForumsModule().removeCategory(source);
Modified: labs/jbossforums/branches/forums22/forums/src/resources/portal-forums-war/WEB-INF/classes/ResourceJSF.properties
===================================================================
--- labs/jbossforums/branches/forums22/forums/src/resources/portal-forums-war/WEB-INF/classes/ResourceJSF.properties 2007-01-11 16:06:51 UTC (rev 8825)
+++ labs/jbossforums/branches/forums22/forums/src/resources/portal-forums-war/WEB-INF/classes/ResourceJSF.properties 2007-01-11 16:07:06 UTC (rev 8826)
@@ -1606,7 +1606,7 @@
Resync=Resync
No_mode=No mode was set
Forum_edit_delete_explain=The form below will allow you to customize all the general board options. For User and Forum configurations use the related links on the left hand side
-
+Delete_all_topics_posts=Delete All Topics/Posts
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.
@@ -1633,7 +1633,7 @@
Edit_Category_explain=Use this form to modify a category\'s name.
Forums_updated=Forum and Category information updated successfully
-
+Delete_all_forums_topics_posts=Delete All Forums/Topics/Posts
Must_delete_forums=You need to delete all forums before you can delete this category
cant_move_to_same_category=You cannot move forums to category you want to remove...
Modified: labs/jbossforums/branches/forums22/forums/src/resources/portal-forums-war/views/admin/deleteCategory.xhtml
===================================================================
--- labs/jbossforums/branches/forums22/forums/src/resources/portal-forums-war/views/admin/deleteCategory.xhtml 2007-01-11 16:06:51 UTC (rev 8825)
+++ labs/jbossforums/branches/forums22/forums/src/resources/portal-forums-war/views/admin/deleteCategory.xhtml 2007-01-11 16:07:06 UTC (rev 8826)
@@ -50,7 +50,8 @@
<tr>
<td class="row1">${resource.Move_contents}</td>
<td class="row1">
- <h:selectOneMenu value="#{adminController.selectedCategory}">
+ <h:selectOneMenu value="#{adminController.selectedCategory}">
+ <f:selectItem itemValue="-1" itemLabel="${resource.Delete_all_forums_topics_posts}" />
<c:forEach items="#{adminPanel.categories}" var="category">
<c:if test="#{category.id != param['c']}">
<f:selectItem itemValue="#{category.id}" itemLabel="#{category.title}" />
Modified: labs/jbossforums/branches/forums22/forums/src/resources/portal-forums-war/views/admin/deleteForum.xhtml
===================================================================
--- labs/jbossforums/branches/forums22/forums/src/resources/portal-forums-war/views/admin/deleteForum.xhtml 2007-01-11 16:06:51 UTC (rev 8825)
+++ labs/jbossforums/branches/forums22/forums/src/resources/portal-forums-war/views/admin/deleteForum.xhtml 2007-01-11 16:07:06 UTC (rev 8826)
@@ -51,7 +51,7 @@
<td class="row1">${resource.Move_contents}</td>
<td class="row1">
<h:selectOneMenu value="#{adminController.selectedForum}">
- <f:selectItem itemValue="-1" itemLabel="Delete All Topics/Posts" />
+ <f:selectItem itemValue="-1" itemLabel="${resource.Delete_all_topics_posts}" />
<c:forEach items="#{adminPanel.forums}" var="forum">
<c:if test="#{forum.id != param['f']}">
<f:selectItem itemValue="#{forum.id}" itemLabel="#{forum.name}" />
More information about the jboss-svn-commits
mailing list