Change the TimelogController's to/from dates based on the project time entries
Instead of looking for the earliest and latest time entry system wide for the dates in the form, now TimelogController will only look at the time entries for the current project (and parent/sub projects). git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4087 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
@@ -283,7 +283,7 @@ class TimelogControllerTest < ActionController::TestCase
|
||||
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
|
||||
|
||||
@@ -325,8 +325,8 @@ class TimelogControllerTest < ActionController::TestCase
|
||||
assert_equal 2, assigns(:entries).size
|
||||
assert_not_nil assigns(:total_hours)
|
||||
assert_equal 154.25, assigns(:total_hours)
|
||||
# display all time by default
|
||||
assert_equal '2007-03-11'.to_date, assigns(:from)
|
||||
# display all time based on what's been logged
|
||||
assert_equal '2007-03-12'.to_date, assigns(:from)
|
||||
assert_equal '2007-04-22'.to_date, assigns(:to)
|
||||
end
|
||||
|
||||
|
||||
@@ -50,17 +50,50 @@ class TimeEntryTest < ActiveSupport::TestCase
|
||||
end
|
||||
|
||||
context "#earilest_date_for_project" do
|
||||
should "return the lowest spent_on value that is visible to the current user" do
|
||||
setup do
|
||||
User.current = nil
|
||||
assert_equal "2007-03-12", TimeEntry.earilest_date_for_project.to_s
|
||||
@public_project = Project.generate!(:is_public => true)
|
||||
@issue = Issue.generate_for_project!(@public_project)
|
||||
TimeEntry.generate!(:spent_on => '2010-01-01',
|
||||
:issue => @issue,
|
||||
:project => @public_project)
|
||||
end
|
||||
|
||||
context "without a project" do
|
||||
should "return the lowest spent_on value that is visible to the current user" do
|
||||
assert_equal "2007-03-12", TimeEntry.earilest_date_for_project.to_s
|
||||
end
|
||||
end
|
||||
|
||||
context "with a project" do
|
||||
should "return the lowest spent_on value that is visible to the current user for that project and it's subprojects only" do
|
||||
assert_equal "2010-01-01", TimeEntry.earilest_date_for_project(@public_project).to_s
|
||||
end
|
||||
end
|
||||
|
||||
end
|
||||
|
||||
context "#latest_date_for_project" do
|
||||
should "return the highest spent_on value that is visible to the current user" do
|
||||
setup do
|
||||
User.current = nil
|
||||
assert_equal "2007-04-22", TimeEntry.latest_date_for_project.to_s
|
||||
@public_project = Project.generate!(:is_public => true)
|
||||
@issue = Issue.generate_for_project!(@public_project)
|
||||
TimeEntry.generate!(:spent_on => '2010-01-01',
|
||||
:issue => @issue,
|
||||
:project => @public_project)
|
||||
end
|
||||
end
|
||||
|
||||
|
||||
context "without a project" do
|
||||
should "return the highest spent_on value that is visible to the current user" do
|
||||
assert_equal "2010-01-01", TimeEntry.latest_date_for_project.to_s
|
||||
end
|
||||
end
|
||||
|
||||
context "with a project" do
|
||||
should "return the highest spent_on value that is visible to the current user for that project and it's subprojects only" do
|
||||
project = Project.find(1)
|
||||
assert_equal "2007-04-22", TimeEntry.latest_date_for_project(project).to_s
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
Reference in New Issue
Block a user