jro_apps/redmine Commit - r4032:b5bbc933252d

Merged r4087 from trunk....

Eric Davis -

r4032:b5bbc933252d

parent child

Context file:

r4032:b5bbc933252d

Collapse all files

app/controllers/timelog_controller.rb +2 -2

                 end
                 @from, @to = @to, @from if @from && @to && @from > @to
-                @from ||= (TimeEntry.earilest_date_for_project || Date.today) - 1
+                @from ||= (TimeEntry.earilest_date_for_project(@project) || Date.today)
-                @to   ||= (TimeEntry.latest_date_for_project || Date.today)
+                @to   ||= (TimeEntry.latest_date_for_project(@project) || Date.today)
               end
               def load_available_criterias

app/models/project.rb +9 0

@@ -449,6 +449,15 class Project < ActiveRecord::Base
449	enabled_modules.clear	449	enabled_modules.clear
450	end	450	end
451	end	451	end
		452
		453	# Returns an array of projects that are in this project's hierarchy
		454	#
		455	# Example: parents, children, siblings
		456	def hierarchy
		457	parents = project.self_and_ancestors \|\| []
		458	descendants = project.descendants \|\| []
		459	project_hierarchy = parents \| descendants # Set union
		460	end
452		461
453	# Returns an auto-generated project identifier based on the last identifier used	462	# Returns an auto-generated project identifier based on the last identifier used
454	def self.next_identifier	463	def self.next_identifier

app/models/time_entry.rb +12 -4

@@ -82,11 +82,19 class TimeEntry < ActiveRecord::Base
82	end	82	end
83	end	83	end
84		84
85	def self.earilest_date_for_project	85	def self.earilest_date_for_project(project=nil)
86	~~TimeEntry~~.~~minimum~~(~~:spent_on~~, ~~:include~~ => ~~:project~~, ~~:conditions~~ => Project.allowed_to_condition(User.current, :view_time_entries))	86	finder_conditions = ARCondition.new(Project.allowed_to_condition(User.current, :view_time_entries))
		87	if project
		88	finder_conditions << ["project_id IN (?)", project.hierarchy.collect(&:id)]
		89	end
		90	TimeEntry.minimum(:spent_on, :include => :project, :conditions => finder_conditions.conditions)
87	end	91	end
88		92
89	def self.latest_date_for_project	93	def self.latest_date_for_project(project=nil)
90	~~TimeEntry~~.~~maximum~~(~~:spent_on~~, ~~:include~~ => ~~:project~~, ~~:conditions~~ => Project.allowed_to_condition(User.current, :view_time_entries))	94	finder_conditions = ARCondition.new(Project.allowed_to_condition(User.current, :view_time_entries))
		95	if project
		96	finder_conditions << ["project_id IN (?)", project.hierarchy.collect(&:id)]
		97	end
		98	TimeEntry.maximum(:spent_on, :include => :project, :conditions => finder_conditions.conditions)
91	end	99	end
92	end	100	end

test/functional/timelog_controller_test.rb +3 -3

                 assert_not_nil assigns(:total_hours)
                 assert_equal "162.90", "%.2f" % assigns(:total_hours)
                 # display all time by default
-                assert_equal '2007-03-11'.to_date, assigns(:from)
+                assert_equal '2007-03-12'.to_date, assigns(:from)
                 assert_equal '2007-04-22'.to_date, assigns(:to)
               end
                 assert_equal 2, assigns(:entries).size
                 assert_not_nil assigns(:total_hours)
                 assert_equal 154.25, assigns(:total_hours)
-                # display all time by default
+                # display all time based on what's been logged
-                assert_equal '2007-03-11'.to_date, assigns(:from)
+                assert_equal '2007-03-12'.to_date, assigns(:from)
                 assert_equal '2007-04-22'.to_date, assigns(:to)
               end

test/unit/time_entry_test.rb +39 -6

@@ -50,17 +50,50 class TimeEntryTest < ActiveSupport::TestCase
50	end	50	end
51		51
52	context "#earilest_date_for_project" do	52	context "#earilest_date_for_project" do
53	should "return the lowest spent_on value that is visible to the current user" do	53	setup do
54	User.current = nil	54	User.current = nil
55	assert_equal "2007-03-12", TimeEntry.earilest_date_for_project.to_s	55	@public_project = Project.generate!(:is_public => true)
		56	@issue = Issue.generate_for_project!(@public_project)
		57	TimeEntry.generate!(:spent_on => '2010-01-01',
		58	:issue => @issue,
		59	:project => @public_project)
56	end	60	end
		61
		62	context "without a project" do
		63	should "return the lowest spent_on value that is visible to the current user" do
		64	assert_equal "2007-03-12", TimeEntry.earilest_date_for_project.to_s
		65	end
		66	end
		67
		68	context "with a project" do
		69	should "return the lowest spent_on value that is visible to the current user for that project and it's subprojects only" do
		70	assert_equal "2010-01-01", TimeEntry.earilest_date_for_project(@public_project).to_s
		71	end
		72	end
		73
57	end	74	end
58		75
59	context "#latest_date_for_project" do	76	context "#latest_date_for_project" do
60	should "return the highest spent_on value that is visible to the current user" do	77	setup do
61	User.current = nil	78	User.current = nil
62	assert_equal "2007-04-22", TimeEntry.latest_date_for_project.to_s	79	@public_project = Project.generate!(:is_public => true)
		80	@issue = Issue.generate_for_project!(@public_project)
		81	TimeEntry.generate!(:spent_on => '2010-01-01',
		82	:issue => @issue,
		83	:project => @public_project)
63	end	84	end
64	end	85
65		86	context "without a project" do
		87	should "return the highest spent_on value that is visible to the current user" do
		88	assert_equal "2010-01-01", TimeEntry.latest_date_for_project.to_s
		89	end
		90	end
		91
		92	context "with a project" do
		93	should "return the highest spent_on value that is visible to the current user for that project and it's subprojects only" do
		94	project = Project.find(1)
		95	assert_equal "2007-04-22", TimeEntry.latest_date_for_project(project).to_s
		96	end
		97	end
		98	end
66	end	99	end

General Comments 0

Write
Preview

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

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	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