changeset 902:8623d131c9ad live

Merge from branch "cannam"

--- a/app/views/repositories/_navigation.rhtml	Wed Feb 01 14:35:56 2012 +0000
+++ b/app/views/repositories/_navigation.rhtml	Thu Feb 02 15:26:47 2012 +0000
@@ -2,7 +2,7 @@
   <%= javascript_include_tag 'repository_navigation' %>
 <% end %>
 
-<%= link_to_revision_archive(@repository, @changeset, @project, { :text => l(:label_download_revision), :class => 'icon icon-package' }) %>
+<%= link_to_revision_archive(@repository, @rev, @project, { :text => l(:label_download_revision), :class => 'icon icon-package' }) %>
 
 <% form_tag({:action => controller.action_name, :id => @project, :path => to_path_param(@path), :rev => ''}, {:method => :get, :id => 'revision_selector'}) do -%>
   <!-- Branches Dropdown -->

--- a/vendor/plugins/redmine_tags/app/views/projects/_tags_form.html.erb	Wed Feb 01 14:35:56 2012 +0000
+++ b/vendor/plugins/redmine_tags/app/views/projects/_tags_form.html.erb	Thu Feb 02 15:26:47 2012 +0000
@@ -3,6 +3,6 @@
   <p id="project_tags"><%= f.text_field :tag_list, :label => :tags, :size => 60, :class => 'hol' %></p>
   <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', :project_id => 1)}', false)" %>
+  <%= javascript_tag "observeProjectTagsField('#{url_for(:controller => 'auto_completes', :action => 'project_tags', :project_id => Project.first.id)}', false)" %>
 </div>
 <% end -%>
\ No newline at end of file

--- a/vendor/plugins/redmine_tags/lib/redmine_tags/patches/projects_controller_patch.rb	Wed Feb 01 14:35:56 2012 +0000
+++ b/vendor/plugins/redmine_tags/lib/redmine_tags/patches/projects_controller_patch.rb	Thu Feb 02 15:26:47 2012 +0000
@@ -34,6 +34,7 @@
           sort_update %w(name lft created_on updated_on)
           @limit = per_page_option
           @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
         end
@@ -120,9 +121,9 @@
           end
 
           if  @question == ""
-            @projects = Project.visible
+            @projects = Project.visible_roots
           else
-            @projects = Project.visible.search_by_question(@question)
+            @projects = Project.visible_roots.find(Project.visible.search_by_question(@question))
           end
   
           unless @tag_list.empty?
@@ -132,7 +133,7 @@
           
           @projects = @projects.collect{ |project| project.root }
           @projects = @projects.uniq
-
+                    
         end
       end
     end