# HG changeset patch # User luisf # Date 1358173083 0 # Node ID fa73588e91051caab9013e9632740ebe4c00c66a # Parent e475178f7a1c9c9c6e494e94b3a52c7919985873 Removes unneeded/buggy query. diff -r e475178f7a1c -r fa73588e9105 plugins/redmine_tags/lib/redmine_tags/patches/projects_controller_patch.rb --- a/plugins/redmine_tags/lib/redmine_tags/patches/projects_controller_patch.rb Thu Jan 10 15:36:32 2013 +0000 +++ b/plugins/redmine_tags/lib/redmine_tags/patches/projects_controller_patch.rb Mon Jan 14 14:18:03 2013 +0000 @@ -34,7 +34,12 @@ sort_init 'name' sort_update %w(name lft created_on updated_on) @limit = per_page_option - @project_count = Project.visible_roots.find(@projects).count + + # Only top-level visible projects are counted --lf.10Jan2013 + top_level_visible_projects = @projects.select{ |p| p.parent_id.nil? and p.visible? } + @project_count = top_level_visible_projects.count + + # Project.visible_roots.find(@projects).count @project_pages = ActionController::Pagination::Paginator.new self, @project_count, @limit, params['page'] @offset ||= @project_pages.current.offset @@ -77,11 +82,14 @@ filter_projects get_fieldset_statuses + sort_clause = "name" + respond_to do |format| format.html { paginate_projects - @projects = Project.visible_roots.find(@projects, :offset => @offset, :limit => @limit, :order => sort_clause) + # todo: check ordering ~luisf.14/Jan/2013 + @projects = @projects[@offset, @limit] if User.current.logged? # seems sort_by gives us case-sensitive ordering, which we don't want @@ -129,6 +137,7 @@ unless @tag_list.empty? @tagged_projects_ids = Project.visible.tagged_with(@tag_list).collect{ |project| Project.find(project.id).root } + @projects = @projects & @tagged_projects_ids @projects = @projects.uniq end