jro_apps/redmine Commit - r4363:b89820080366

Select projects with issue_tracking module for gantt display and remove the nil start/due dates trick....

Jean-Philippe Lang -

r4363:b89820080366

parent child

Context file:

r4363:b89820080366

app/models/project.rb +10 -14

               # The earliest start date of a project, based on it's issues and versions
               def start_date
-                if module_enabled?(:issue_tracking)
+                 issues.minimum('start_date'),
-                   issues.minimum('start_date'),
+                 shared_versions.collect(&:effective_date),
-                   shared_versions.collect(&:effective_date),
+                 shared_versions.collect {|v| v.fixed_issues.minimum('start_date')}
-                   shared_versions.collect {|v| v.fixed_issues.minimum('start_date')}
+                ].flatten.compact.min
-                  ].flatten.compact.min
-                end
               end
               # The latest due date of an issue or version
               def due_date
-                if module_enabled?(:issue_tracking)
+                 issues.maximum('due_date'),
-                   issues.maximum('due_date'),
+                 shared_versions.collect(&:effective_date),
-                   shared_versions.collect(&:effective_date),
+                 shared_versions.collect {|v| v.fixed_issues.maximum('due_date')}
-                   shared_versions.collect {|v| v.fixed_issues.maximum('due_date')}
+                ].flatten.compact.max
-                  ].flatten.compact.max
-                end
               end
               def overdue?

lib/redmine/helpers/gantt.rb +4 -4

                     if @project
                       return number_of_rows_on_project(@project)
                     else
-                      Project.roots.visible.inject(0) do |total, project|
+                      Project.roots.visible.has_module('issue_tracking').inject(0) do |total, project|
                         total += number_of_rows_on_project(project)
                       end
                     end
                     end
                     # Subprojects
-                    project.children.visible.each do |subproject|
+                    project.children.visible.has_module('issue_tracking').each do |subproject|
                       count += number_of_rows_on_project(subproject)
                     end
                     if @project
                       render_project(@project, options)
                     else
-                      Project.roots.visible.each do |project|
+                      Project.roots.visible.has_module('issue_tracking').each do |project|
                         render_project(project, options)
                       end
                     end
                     end
                     # Fourth, subprojects
-                    project.children.visible.each do |project|
+                    project.children.visible.has_module('issue_tracking').each do |project|
                       render_project(project, options)
                     end

test/unit/project_test.rb 0 -16

                 should "be nil if there are no issues on the project" do
                   assert_nil @project.start_date
                 end
-                should "be nil if issue tracking is disabled" do
-                  Issue.generate_for_project!(@project, :start_date => Date.today)
-                  @project.enabled_modules.find_all_by_name('issue_tracking').each {|m| m.destroy}
-                  @project.reload
-                  assert_nil @project.start_date
-                end
                 should "be tested when issues have no start date"
                 should "be nil if there are no issues on the project" do
                   assert_nil @project.due_date
                 end
-                should "be nil if issue tracking is disabled" do
-                  Issue.generate_for_project!(@project, :due_date => Date.today)
-                  @project.enabled_modules.find_all_by_name('issue_tracking').each {|m| m.destroy}
-                  @project.reload
-                  assert_nil @project.due_date
-                end
                 should "be tested when issues have no due date"

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