kolan
/
obsolete.ChilliProject
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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
This commit is contained in:
Jean-Philippe Lang 2009-12-12 15:33:31 +00:00
parent c66943c9b8
commit d58762a52d
3 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/controllers/projects_controller.rb
View File

@ -319,9 +319,9 @@ class ProjectsController < ApplicationController
conditions.merge!(:project_id => project_ids) conditions.merge!(:project_id => project_ids)
end end
issues = version.fixed_issues.visible.find(:all, issues = version.fixed_issues.visible.find(:all,
:include => [:status, :tracker, :priority], :include => [:project, :status, :tracker, :priority],
:conditions => conditions, :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 @issues_by_version[version] = issues
end end
end end

2
app/helpers/application_helper.rb
View File

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

4
app/views/projects/roadmap.rhtml
View File

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