jro_apps/redmine Commit - r9427:38011c0fb11b

Fixed error on commits per month graph (#10806)....

Jean-Philippe Lang -

r9427:38011c0fb11b

parent child

Context file:

r9427:38011c0fb11b

app/controllers/repositories_controller.rb +2 -2

                                       :all, :group => :commit_date,
                                       :conditions => ["repository_id = ? AND commit_date BETWEEN ? AND ?", repository.id, @date_from, @date_to])
                 commits_by_month = [0] * 12
-                commits_by_day.each {|c| commits_by_month[c.first.to_date.months_ago] += c.last }
+                commits_by_day.each {|c| commits_by_month[(@date_to.month - c.first.to_date.month) % 12] += c.last }
                 changes_by_day = Change.count(
                                       :all, :group => :commit_date, :include => :changeset,
                                       :conditions => ["#{Changeset.table_name}.repository_id = ? AND #{Changeset.table_name}.commit_date BETWEEN ? AND ?", repository.id, @date_from, @date_to])
                 changes_by_month = [0] * 12
-                changes_by_day.each {|c| changes_by_month[c.first.to_date.months_ago] += c.last }
+                changes_by_day.each {|c| changes_by_month[(@date_to.month - c.first.to_date.month) % 12] += c.last }
                 fields = []
 .times {|m| fields << month_name(((Date.today.month - 1 - m) % 12) + 1)}

test/functional/repositories_controller_test.rb +5 0

               end
               def test_graph_commits_per_month
+                # Make sure there's some data to display
+                latest = Project.find(1).repository.changesets.maximum(:commit_date)
+                assert_not_nil latest
+                Date.stubs(:today).returns(latest.to_date + 10)
                 get :graph, :id => 1, :graph => 'commits_per_month'
                 assert_response :success
                 assert_equal 'image/svg+xml', @response.content_type

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