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

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

Author: unibrew
Date: 2007-01-11 08:13:40 -0500 (Thu, 11 Jan 2007)
New Revision: 8817

Modified:
   labs/jbossforums/branches/forums22/forums/src/main/org/jboss/portlet/forums/impl/ForumsModuleImpl.java
   labs/jbossforums/branches/forums22/forums/src/main/org/jboss/portlet/forums/ui/action/ModeratorAction.java
Log:
[JBFORUMS-156] Fixed. Now topicCount and postCount values for forum are correctly updated when executing moderator actions.

Modified: labs/jbossforums/branches/forums22/forums/src/main/org/jboss/portlet/forums/impl/ForumsModuleImpl.java
===================================================================
--- labs/jbossforums/branches/forums22/forums/src/main/org/jboss/portlet/forums/impl/ForumsModuleImpl.java	2007-01-11 13:13:30 UTC (rev 8816)
+++ labs/jbossforums/branches/forums22/forums/src/main/org/jboss/portlet/forums/impl/ForumsModuleImpl.java	2007-01-11 13:13:40 UTC (rev 8817)
@@ -937,10 +937,13 @@
       {
          //session.flush();
          //session.delete(topic);
-         if (topic.getForum() != null)
+         Forum forum = topic.getForum();
+         if (forum != null)
          {
-            topic.getForum().getTopics().remove(topic);
+            forum.getTopics().remove(topic);
             topic.setForum(null);
+            forum.setPostCount(forum.getPostCount()-topic.getReplies()-1);
+            forum.setTopicCount(forum.getTopicCount()-1);
             //session.delete(topic);
          }
          else

Modified: labs/jbossforums/branches/forums22/forums/src/main/org/jboss/portlet/forums/ui/action/ModeratorAction.java
===================================================================
--- labs/jbossforums/branches/forums22/forums/src/main/org/jboss/portlet/forums/ui/action/ModeratorAction.java	2007-01-11 13:13:30 UTC (rev 8816)
+++ labs/jbossforums/branches/forums22/forums/src/main/org/jboss/portlet/forums/ui/action/ModeratorAction.java	2007-01-11 13:13:40 UTC (rev 8817)
@@ -196,8 +196,13 @@
             setWarnBundleMessage("ERR_INTERNAL");
             return "success";
         }
+        
         Iterator it = checkboxes.keySet().iterator();
         try {
+            
+            // Refreshing forum from which topics are going to be moved
+            this.forum = getForumsModule().findForumById(forum.getId());
+            
             while (it.hasNext()) 
             {
                 Integer topicId = (Integer)it.next();
@@ -212,7 +217,14 @@
                         setWarnBundleMessage("ERR_INTERNAL");
                         return "success";
                     }
+                    
                     forumDest.addTopic(topic);
+                    forumDest.setPostCount(forumDest.getPostCount()+topic.getReplies()+1);
+                    forumDest.setTopicCount(forumDest.getTopicCount()+1);
+                    
+                    this.forum.setPostCount(this.forum.getPostCount()-topic.getReplies()-1);
+                    this.forum.setTopicCount(this.forum.getTopicCount()-1);
+                    
                     getForumsModule().getHibernate().getSessionFactory().getCurrentSession().flush();
                 }
             }