Roadmap: sort issues by project and prepend project name if different (#4373).

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3163 e93f8b46-1217-0410-a6f0-8f06a7374b81

Roadmap: sort issues by project and prepend project name if different (#4373).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3163 e93f8b46-1217-0410-a6f0-8f06a7374b81
d58762a5 · Jean-Philippe Lang · c66943c9 · d58762a5 · d58762a5 · d58762a5
Commit d58762a5 authored Dec 12, 2009 by Jean-Philippe Lang
Showing with 6 additions and 4 deletions

projects_controller.rb app/controllers/projects_controller.rb +2 -2

application_helper.rb app/helpers/application_helper.rb +2 -0

roadmap.rhtml app/views/projects/roadmap.rhtml +2 -2

No files found.
--- a/app/controllers/projects_controller.rb
+++ b/app/controllers/projects_controller.rb
@@ -319,9 +319,9 @@ class ProjectsController < ApplicationController
          conditions.merge!(:project_id => project_ids)
        end
        issues = version.fixed_issues.visible.find(:all,
-                                                   :include => [:status, :tracker, :priority],
+                                                   :include => [:project, :status, :tracker, :priority],
                                                   :conditions => conditions,
-                                                   :order => "#{Tracker.table_name}.position, #{Issue.table_name}.id")
+                                                   :order => "#{Project.table_name}.lft, #{Tracker.table_name}.position, #{Issue.table_name}.id")
        @issues_by_version[version] = issues
      end
    end

--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -64,6 +64,7 @@ module ApplicationHelper
  #   link_to_issue(issue)                        # => Defect #6: This is the subject
  #   link_to_issue(issue, :truncate => 6)        # => Defect #6: This i...
  #   link_to_issue(issue, :subject => false)     # => Defect #6
+  #   link_to_issue(issue, :project => true)      # => Foo - Defect #6
  #
  def link_to_issue(issue, options={})
    title = nil
@@ -80,6 +81,7 @@ module ApplicationHelper
                                                 :class => issue.css_classes,
                                                 :title => title
    s << ": #{h subject}" if subject
+    s = "#{h issue.project} - " + s if options[:project]
    s
  end


--- a/app/views/projects/roadmap.rhtml
+++ b/app/views/projects/roadmap.rhtml
@@ -14,7 +14,7 @@
    <fieldset class="related-issues"><legend><%= l(:label_related_issues) %></legend>
    <ul>
    <%- issues.each do |issue| -%>
-        <li><%= link_to_issue(issue) %></li>
+        <li><%= link_to_issue(issue, :project => (@project != issue.project)) %></li>
    <%- end -%>
    </ul>
    </fieldset>
@@ -29,7 +29,7 @@
 <h3><%= l(:label_roadmap) %></h3>
 <% @trackers.each do |tracker| %>
  <label><%= check_box_tag "tracker_ids[]", tracker.id, (@selected_tracker_ids.include? tracker.id.to_s), :id => nil %>
-  <%= tracker.name %></label><br />
+  <%=h tracker.name %></label><br />
 <% end %>
 <br />
 <label for="completed"><%= check_box_tag "completed", 1, params[:completed] %> <%= l(:label_show_completed_versions) %></label>