jro_apps/redmine Commit - r4307:77c6188ec272

Fixed: gantt displays issues by date of creation....

Jean-Philippe Lang -

r4307:77c6188ec272

parent child

Context file:

r4307:77c6188ec272

app/models/issue.rb +1 -2

                                               :conditions => ["#{Project.table_name}.status=#{Project::STATUS_ACTIVE}"]
               named_scope :for_gantt, lambda {
                 {
-                  :include => [:tracker, :status, :assigned_to, :priority, :project, :fixed_version],
+                  :include => [:tracker, :status, :assigned_to, :priority, :project, :fixed_version]
-                  :order => "#{Issue.table_name}.due_date ASC, #{Issue.table_name}.start_date ASC, #{Issue.table_name}.id ASC"
                 }
               }

lib/redmine/helpers/gantt.rb +13 0

                     # Second, Issues without a version
                     issues = project.issues.for_gantt.without_version.with_query(@query)
+                    sort_issues!(issues)
                     if issues
                       issue_rendering = render_issues(issues, options)
                       output << issue_rendering if options[:format] == :html
                     issues = version.fixed_issues.for_gantt.with_query(@query)
                     if issues
+                      sort_issues!(issues)
                       # Indent issues
                       options[:indent] += options[:indent_increment]
                       output << render_issues(issues, options)
                   private
+                  # Sorts a collection of issues by start_date, due_date, id for gantt rendering
+                  def sort_issues!(issues)
+                    issues.sort! do |a, b|
+                      cmp = 0
+                      cmp = (a.start_date <=> b.start_date) if a.start_date? && b.start_date?
+                      cmp = (a.due_date <=> b.due_date) if cmp == 0 && a.due_date? && b.due_date?
+                      cmp = (a.id <=> b.id) if cmp == 0
+                      cmp
+                    end
+                  end
                   # Renders both the subjects and lines of the Gantt chart for the
                   # PDF format
                   def pdf_subjects_and_lines(pdf, options = {})

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