jro_apps/redmine Commit - r3049:d58762a52dd7

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

Jean-Philippe Lang -

r3049:d58762a52dd7

parent child

Context file:

r3049:d58762a52dd7

app/controllers/projects_controller.rb +2 -2

                       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

app/helpers/application_helper.rb +2 0

               #   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
                                                              :class => issue.css_classes,
                                                              :title => title
                 s << ": #{h subject}" if subject
+                s = "#{h issue.project} - " + s if options[:project]
                 s
               end

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

                 <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>
             <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>

General Comments 0

You need to be logged in to leave comments. Login now

No TODOs yet

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages