changeset 762:7dc4d205233e cannam

Merge from branch "feature_14"

--- a/app/controllers/projects_controller.rb	Fri Nov 11 16:04:44 2011 +0000
+++ b/app/controllers/projects_controller.rb	Tue Nov 15 10:34:25 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/_filter_tags.rhtml	Fri Nov 11 16:04:44 2011 +0000
+++ b/vendor/plugins/redmine_tags/app/views/projects/_filter_tags.rhtml	Tue Nov 15 10:34:25 2011 +0000
@@ -7,7 +7,7 @@
       <div id="project_tag_candidates" class="autocomplete"></div>
       <%= javascript_include_tag 'tags_input', :plugin => 'redmine_tags' %>
 
-      <%= javascript_tag "observeProjectTagsField('#{url_for(:controller => 'auto_completes', :action => 'project_tags')}')" %>
+      <%= javascript_tag "observeProjectTagsField('#{url_for(:controller => 'auto_completes', :action => 'project_tags', :project_id => Project.first.id)}')" %>
     </div>
   <% end -%>
 </p>

--- a/vendor/plugins/redmine_tags/app/views/projects/_filtered_projects.rhtml	Fri Nov 11 16:04:44 2011 +0000
+++ b/vendor/plugins/redmine_tags/app/views/projects/_filtered_projects.rhtml	Tue Nov 15 10:34:25 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/app/views/projects/index.rhtml	Fri Nov 11 16:04:44 2011 +0000
+++ b/vendor/plugins/redmine_tags/app/views/projects/index.rhtml	Tue Nov 15 10:34:25 2011 +0000
@@ -16,7 +16,7 @@
 
 
 <div style="clear:both;"></div>
-<% form_tag('/projects', :method => :get, :id => :project_filtering) do %>
+<% form_tag(:controller => :projects, :action => :index, :method => :get, :id => :project_filtering) do %>
   <fieldset id="filters" class="collapsible">
     <legend onclick="toggleFieldset(this);"><%= l(:label_filter_plural) %></legend>
     <div>

--- a/vendor/plugins/redmine_tags/lib/redmine_tags/patches/projects_controller_patch.rb	Fri Nov 11 16:04:44 2011 +0000
+++ b/vendor/plugins/redmine_tags/lib/redmine_tags/patches/projects_controller_patch.rb	Tue Nov 15 10:34:25 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