Fix for filter_communities on search communities with another plugin

Luciano Prestes
1 parent 12f620db
Showing 2 changed files with 19 additions and 7 deletions Show diff stats
lib/ext/community.rb
lib/ext/search_controller.rb
@@ -3,8 +3,20 @@ require_dependency &#39;community&#39;
 class Community
   has_one :institution, :dependent=>:destroy
-
   def institution?
     return !institution.nil?
   end
+
+  def remove_of_community_search_institution?
+    return institution?
+  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
 end
@@ -3,12 +3,12 @@ require_dependency &#39;search_controller&#39;
 class SearchController
   def communities
-    results = filter_communities_list do |community|
-      !community.institution?
-    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 institutions
	@@ -3,8 +3,20 @@ require_dependency 'community'		@@ -3,8 +3,20 @@ require_dependency 'community'
3	class Community	3	class Community
4	has_one :institution, :dependent=>:destroy	4	has_one :institution, :dependent=>:destroy
5		5
6	-
7	def institution?	6	def institution?
8	return !institution.nil?	7	return !institution.nil?
9	end	8	end
		9	+
		10	+ def remove_of_community_search_institution?
		11	+ return institution?
		12	+ end
		13	+
		14	+ def self.get_valid_communities_string
		15	+ remove_of_communities_methods = Community.instance_methods.select{\|m\| m =~ /remove_of_community_search/}
		16	+ valid_communities_string = ""
		17	+ remove_of_communities_methods.each do \|method\|
		18	+ valid_communities_string += "!community.send('#{method}') && "
		19	+ end
		20	+ valid_communities_string[0..-5]
		21	+ end
10	end	22	end