Mercurial > hg > soundsoftware-site
changeset 760:b2a9e64b8283 feature_14
Fixes Bug #322, but is not self-contained in the plugin (basically I'm editing the original projects controller…)
| author | luisf <luis.figueira@eecs.qmul.ac.uk> |
|---|---|
| date | Fri, 11 Nov 2011 18:32:51 +0000 |
| parents | 7d58183fd14c |
| children | 7dc4d205233e 332e4287f4d3 |
| files | app/controllers/projects_controller.rb vendor/plugins/redmine_tags/app/views/projects/_filtered_projects.rhtml vendor/plugins/redmine_tags/lib/redmine_tags/patches/projects_controller_patch.rb |
| diffstat | 3 files changed, 3 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/app/controllers/projects_controller.rb Fri Nov 11 17:50:58 2011 +0000 +++ b/app/controllers/projects_controller.rb Fri Nov 11 18:32:51 2011 +0000 @@ -55,7 +55,7 @@ @project_count = Project.visible_roots.count @project_pages = Paginator.new self, @project_count, @limit, params['page'] @offset ||= @project_pages.current.offset - @projects = Project.visible_roots.all(:offset => @offset, :limit => @limit, :order => sort_clause) + @projects = Project.visible_roots.find(@filtered_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 # @user_projects = User.current.projects.sort_by(&:name)
--- a/vendor/plugins/redmine_tags/app/views/projects/_filtered_projects.rhtml Fri Nov 11 17:50:58 2011 +0000 +++ b/vendor/plugins/redmine_tags/app/views/projects/_filtered_projects.rhtml Fri Nov 11 18:32:51 2011 +0000 @@ -1,1 +1,1 @@ -<%= render_project_table_with_filtering(@filtered_projects, @question) %> \ No newline at end of file +<%= render_project_table_with_filtering(@projects, @question) %> \ No newline at end of file
--- a/vendor/plugins/redmine_tags/lib/redmine_tags/patches/projects_controller_patch.rb Fri Nov 11 17:50:58 2011 +0000 +++ b/vendor/plugins/redmine_tags/lib/redmine_tags/patches/projects_controller_patch.rb Fri Nov 11 18:32:51 2011 +0000 @@ -75,6 +75,7 @@ # intersection of both prject groups @projects = @projects && @tagged_projects_ids unless @tag_list.empty? + debugger @filtered_projects = @projects end end