[jboss-svn-commits] JBL Code SVN: r26553 - labs/jbossforums/tags/JBOSS_FORUMS_1_2_0_Beta_P26/forums/src/main/org/jboss/portlet/forums/ui/action.

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

Author: sviluppatorefico
Date: 2009-05-15 07:46:00 -0400 (Fri, 15 May 2009)
New Revision: 26553

Modified:
   labs/jbossforums/tags/JBOSS_FORUMS_1_2_0_Beta_P26/forums/src/main/org/jboss/portlet/forums/ui/action/Search.java
Log:


Modified: labs/jbossforums/tags/JBOSS_FORUMS_1_2_0_Beta_P26/forums/src/main/org/jboss/portlet/forums/ui/action/Search.java
===================================================================
--- labs/jbossforums/tags/JBOSS_FORUMS_1_2_0_Beta_P26/forums/src/main/org/jboss/portlet/forums/ui/action/Search.java	2009-05-15 11:37:56 UTC (rev 26552)
+++ labs/jbossforums/tags/JBOSS_FORUMS_1_2_0_Beta_P26/forums/src/main/org/jboss/portlet/forums/ui/action/Search.java	2009-05-15 11:46:00 UTC (rev 26553)
@@ -32,6 +32,8 @@
 import org.jboss.portlet.forums.model.Forum;
 import org.jboss.portlet.forums.search.SearchCriteria;
 import org.jboss.portlet.forums.ui.BaseController;
+import org.jboss.portlet.forums.ui.Constants;
+import org.jboss.portlet.forums.ui.ForumUtil;
 import org.jboss.portlet.forums.ui.JSFUtil;
 
 public class Search extends ActionController {
@@ -75,7 +77,17 @@
         categories.add(new SelectItem("", "Search All Categories"));
         
         try {
-            List<Category> c = BaseController.getForumsModule().findCategories();
+        	
+	        // Luca Stancapiano start
+	        //get the forumInstanceId where this forum should be added
+	        int forumInstanceId = -1;
+	        String cour = ForumUtil.getPreference(Constants.FORUM_INSTANCE_ID);
+	        if(cour!=null && cour.trim().length()>0)
+	        {
+	        	forumInstanceId = Integer.parseInt(cour);
+	        }
+	        
+            List<Category> c = BaseController.getForumsModule().findCategories(forumInstanceId);
             
             if (c != null) {
                 for (Category category : c) {
@@ -98,7 +110,16 @@
         forums.add(new SelectItem("", "Search All Forums"));
         
         try {
-            List<Forum> f = BaseController.getForumsModule().findForums();
+	        // Luca Stancapiano start
+	        //get the forumInstanceId where this forum should be added
+	        int forumInstanceId = -1;
+	        String cour = ForumUtil.getPreference(Constants.FORUM_INSTANCE_ID);
+	        if(cour!=null && cour.trim().length()>0)
+	        {
+	        	forumInstanceId = Integer.parseInt(cour);
+	        }
+	        
+            List<Forum> f = BaseController.getForumsModule().findForums(forumInstanceId);
             
             if (f != null) {
                 for (Forum forum : f) {