changeset 771:8712a4e535d3 feature_14

Fixed bug related to filtering simultaneously bu name & tag.
author luisf <luis.figueira@eecs.qmul.ac.uk>
date Wed, 16 Nov 2011 14:48:31 +0000
parents fd4b5879fb6d
children c4f8106ce808
files vendor/plugins/redmine_tags/lib/redmine_tags/patches/projects_controller_patch.rb
diffstat 1 files changed, 3 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/vendor/plugins/redmine_tags/lib/redmine_tags/patches/projects_controller_patch.rb	Tue Nov 15 17:53:48 2011 +0000
+++ b/vendor/plugins/redmine_tags/lib/redmine_tags/patches/projects_controller_patch.rb	Wed Nov 16 14:48:31 2011 +0000
@@ -94,16 +94,15 @@
 
           @projects = Project.visible
 
-          @featured_projects = @projects.featured if Project.respond_to? :featured
-
           # luisf 
           @projects = @projects.search_by_question(@question) unless @question == ""
           @tagged_projects_ids = Project.tagged_with(@tag_list).collect{ |project| Project.find(project.id) } unless @tag_list.empty?
 
+          # intersection of both prject groups            
+          @projects = @projects & @tagged_projects_ids unless @tag_list.empty?
+
           debugger
 
-          # intersection of both prject groups            
-          @projects = @projects && @tagged_projects_ids unless @tag_list.empty?
         end
       end
     end