[jboss-svn-commits] JBL Code SVN: r16781 - in labs/jbossforums/branches/forums101P26/forums/src: main/org/jboss/portlet/forums/ui/action and 1 other directories.

[jboss-svn-commits at lists.jboss.org]

Author: unibrew
Date: 2007-11-24 18:17:38 -0500 (Sat, 24 Nov 2007)
New Revision: 16781

Modified:
   labs/jbossforums/branches/forums101P26/forums/src/main/org/jboss/portlet/forums/ui/Constants.java
   labs/jbossforums/branches/forums101P26/forums/src/main/org/jboss/portlet/forums/ui/action/AdminController.java
   labs/jbossforums/branches/forums101P26/forums/src/resources/portal-forums-war/views/admin/index.xhtml
Log:
[JBFORUMS-267] Moving back changes commited by mistake with previous commit.

Modified: labs/jbossforums/branches/forums101P26/forums/src/main/org/jboss/portlet/forums/ui/Constants.java
===================================================================
--- labs/jbossforums/branches/forums101P26/forums/src/main/org/jboss/portlet/forums/ui/Constants.java	2007-11-24 22:47:34 UTC (rev 16780)
+++ labs/jbossforums/branches/forums101P26/forums/src/main/org/jboss/portlet/forums/ui/Constants.java	2007-11-24 23:17:38 UTC (rev 16781)
@@ -39,8 +39,6 @@
     public static final String FEEDBACK = "feedback";
     public static final String EDIT_CATEGORY = "editCategory";
     public static final String EDIT_FORUM = "editForum";
-    public static final String ADD_CATEGORY = "addCategory";
-    public static final String ADD_FORUM = "addForum";
     public static final String EDIT_WATCH = "editWatch";
     public static final String DELETE_CATEGORY = "deleteCategory";
     public static final String DELETE_FORUM = "deleteForum";

Modified: labs/jbossforums/branches/forums101P26/forums/src/main/org/jboss/portlet/forums/ui/action/AdminController.java
===================================================================
--- labs/jbossforums/branches/forums101P26/forums/src/main/org/jboss/portlet/forums/ui/action/AdminController.java	2007-11-24 22:47:34 UTC (rev 16780)
+++ labs/jbossforums/branches/forums101P26/forums/src/main/org/jboss/portlet/forums/ui/action/AdminController.java	2007-11-24 23:17:38 UTC (rev 16781)
@@ -67,8 +67,6 @@
      */
     private boolean editCategoryMode;
     private boolean editForumMode;
-    private boolean addCategoryMode;
-    private boolean addForumMode;
     
     //-----ui data-------------------------------------------------------------------------------------------------------------------------
     /**
@@ -174,8 +172,6 @@
         this.selectedForum = -1;
         this.editCategoryMode = false;
         this.editForumMode = false;
-        this.addCategoryMode = false;
-        this.addForumMode = false;
     }
     //-------------------------------------------------------------------------------------------------------------------------------------
     /**
@@ -244,19 +240,6 @@
             {
                 this.editForumMode = Boolean.valueOf(editForStr).booleanValue();
             }
-            
-            // Checking for addModes flags
-            String addCatStr = ForumUtil.getParameter(Constants.ADD_CATEGORY);
-            if (addCatStr != null && addCatStr.trim().length()>0)
-            {
-                this.addCategoryMode = Boolean.valueOf(editCatStr).booleanValue();
-            }
-            
-            String addForStr = ForumUtil.getParameter(Constants.ADD_FORUM);
-            if (editForStr != null && editForStr.trim().length()>0)
-            {
-                this.addForumMode = Boolean.valueOf(addForStr).booleanValue();
-            }
         }
         catch(Exception e)
         {

Modified: labs/jbossforums/branches/forums101P26/forums/src/resources/portal-forums-war/views/admin/index.xhtml
===================================================================
--- labs/jbossforums/branches/forums101P26/forums/src/resources/portal-forums-war/views/admin/index.xhtml	2007-11-24 22:47:34 UTC (rev 16780)
+++ labs/jbossforums/branches/forums101P26/forums/src/resources/portal-forums-war/views/admin/index.xhtml	2007-11-24 23:17:38 UTC (rev 16781)
@@ -43,11 +43,10 @@
     <!-- Add new category button -->
     <forums:isAllowed fragment="acl://addCategory">
     <h:form>
-    <input type="hidden" name="addCategory" value="true" />
     <div class="actionbuttons">
         <ul>
             <li>
-                <h:commandLink action="#{adminController.dummyAction}">
+                <h:commandLink action="#{adminController.addCategory}">
                     <img src="${forums:themeURL('resourceAdminNewCategoryURL')}"
                          alt="${resource.Create_category}" name="newCategory"
                          border="0" />
@@ -74,7 +73,7 @@
         
         <c:choose>
         
-            <c:when test="${ ( (adminController.editCategoryMode or adminController.addCategoryMode or forums:message('form:Category') ne null) 
+            <c:when test="${ ( (adminController.editCategoryMode or forums:message('form:Category') ne null) 
                                and (adminController.selectedCategory eq category.id)                         )
                              or 
                              ( (forums:nullIfEmptyString(category.title) eq null)                            )}" >
@@ -104,9 +103,8 @@
                         <forums:isAllowed fragment="acl://addForum">
                         <h:form>
                             <input type="hidden" name="c" value="#{category.id}"/>
-                            <input type="hidden" name="addForum" value="true" />
                             <div class="forumfloatright actionbuttons">
-                                <h:commandLink action="#{adminController.dummyAction}">
+                                <h:commandLink action="#{adminController.addForum}">
                                     <img src="${forums:themeURL('resourceAdminNewForumURL')}"
                                          alt="${resource.Create_forum}" border="0" />
                                 </h:commandLink>
@@ -215,7 +213,7 @@
         
         <c:choose>
         
-            <c:when test="${( (adminController.editForumMode or adminController.addForumMode or forums:message('forumForm:Forum') ne null)
+            <c:when test="${( (adminController.editForumMode or forums:message('forumForm:Forum') ne null)
                                and adminController.selectedForum eq forum.id                              )
                             or ( forums:nullIfEmptyString(forum.name) eq null                         )}" >
                 <tr class="editRow">
@@ -370,10 +368,9 @@
     <forums:isAllowed fragment="acl://addCategory">
     <h:form>
     <div class="actionbuttons">
-    <input type="hidden" name="addCategory" value="true" />
         <ul>
             <li>
-                <h:commandLink action="#{adminController.dummyAction}">
+                <h:commandLink action="#{adminController.addCategory}">
                     <img src="${forums:themeURL('resourceAdminNewCategoryURL')}"
                          alt="${resource.Create_category}" name="newCategory"
                          border="0" />