Fix for filter_communities on search communities with another plugin

Luciano Prestes · Thiago Ribeiro
1 parent f62669cc
Showing 2 changed files with 19 additions and 7 deletions Show diff stats
lib/ext/community.rb
lib/ext/search_controller.rb
@@ -26,6 +26,15 @@ class Community
     community
   end
+  def self.get_valid_communities_string
+    remove_of_communities_methods = Community.instance_methods.select{|m| m =~ /remove_of_community_search/}
+    valid_communities_string = ""
+    remove_of_communities_methods.each do |method|
+      valid_communities_string += "!community.send('#{method}') && "
+    end
+    valid_communities_string[0..-5]
+  end
+
   def software?
     return !software_info.nil?
   end
@@ -39,4 +48,8 @@ class Community
    self.visible = true
    self.save!
   end
+
+  def remove_of_community_search_software?
+    return software?
+  end
 end
@@ -3,12 +3,12 @@ require_dependency &#39;search_controller&#39;
 class SearchController
   def communities
-    results = filter_communities_list do |community|
-      !community.software?
-    end
-    results = results.paginate(:per_page => 24, :page => params[:page])
-    @searches[@asset] = {:results => results}
-    @search = results
+    valid_communities_string = Community.get_valid_communities_string
+
+    @scope = visible_profiles(Community)
+    @scope.each{|community| @scope.delete(community) unless eval(valid_communities_string)}
+
+    full_text_search
   end
   def software_infos
@@ -162,5 +162,4 @@ class SearchController
       end
     end
   end
-
 end
	@@ -26,6 +26,15 @@ class Community		@@ -26,6 +26,15 @@ class Community
26	community	26	community
27	end	27	end
28		28
		29	+ def self.get_valid_communities_string
		30	+ remove_of_communities_methods = Community.instance_methods.select{\|m\| m =~ /remove_of_community_search/}
		31	+ valid_communities_string = ""
		32	+ remove_of_communities_methods.each do \|method\|
		33	+ valid_communities_string += "!community.send('#{method}') && "
		34	+ end
		35	+ valid_communities_string[0..-5]
		36	+ end
		37	+
29	def software?	38	def software?
30	return !software_info.nil?	39	return !software_info.nil?
31	end	40	end
	@@ -39,4 +48,8 @@ class Community		@@ -39,4 +48,8 @@ class Community
39	self.visible = true	48	self.visible = true
40	self.save!	49	self.save!
41	end	50	end
		51	+
		52	+ def remove_of_community_search_software?
		53	+ return software?
		54	+ end
42	end	55	end