Mercurial > hg > soundsoftware-site

changeset 769:9af86029dc90 feature_14

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fixed a bug which caused the pagination to show the total number of projects even after filtering the list.
author luisf <luis.figueira@eecs.qmul.ac.uk>
date Tue, 15 Nov 2011 16:36:22 +0000
parents 0829e808ec49
children fd4b5879fb6d
files vendor/plugins/redmine_tags/lib/redmine_tags/patches/projects_controller_patch.rb
diffstat 1 files changed, 7 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- a/vendor/plugins/redmine_tags/lib/redmine_tags/patches/projects_controller_patch.rb	Tue Nov 15 16:03:07 2011 +0000
+++ b/vendor/plugins/redmine_tags/lib/redmine_tags/patches/projects_controller_patch.rb	Tue Nov 15 16:36:22 2011 +0000
@@ -35,9 +35,9 @@
           sort_init 'name'
           sort_update %w(name lft created_on updated_on)
           @limit = per_page_option
-          @project_count = Project.visible_roots.count
+          @project_count = Project.visible_roots.find(@projects).count
           @project_pages = ActionController::Pagination::Paginator.new self, @project_count, @limit, params['page']
-          @offset ||= @project_pages.current.offset          
+          @offset ||= @project_pages.current.offset
         end
 
 
@@ -47,10 +47,12 @@
           @project = Project.new
           filter_projects
 
+          debugger
+
           respond_to do |format|
             format.html { 
               paginate_projects
-              @projects = Project.visible_roots.find(@filtered_projects, :offset => @offset, :limit => @limit, :order => sort_clause) 
+              @projects = Project.visible_roots.find(@projects, :offset => @offset, :limit => @limit, :order => sort_clause) 
 
               if User.current.logged?
                 # seems sort_by gives us case-sensitive ordering, which we don't want
@@ -63,7 +65,7 @@
             format.api  {
               @offset, @limit = api_offset_and_limit
               @project_count = Project.visible.count
-              @projects = Project.visible.find(@filtered_projects, :offset => @offset, :limit => @limit, :order => 'lft')
+              @projects = Project.visible.find(@projects, :offset => @offset, :limit => @limit, :order => 'lft')
             }
             format.atom {
               projects = Project.visible.find(:all, :order => 'created_on DESC', :limit => Setting.feeds_limit.to_i)
@@ -72,7 +74,7 @@
             format.js {
               render :update do |page|
                 paginate_projects
-                @projects = Project.visible_roots.find(@filtered_projects, :offset => @offset, :limit => @limit, :order => sort_clause)
+                @projects = Project.visible_roots.find(@projects, :offset => @offset, :limit => @limit, :order => sort_clause)
                 page.replace_html 'projects', :partial => 'filtered_projects'
               end
             }
@@ -102,9 +104,6 @@
 
           # intersection of both prject groups            
           @projects = @projects && @tagged_projects_ids unless @tag_list.empty?
-          
-          debugger          
-          @filtered_projects = @projects
         end
       end
     end