Refactor: move method to Model.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4086 e93f8b46-1217-0410-a6f0-8f06a7374b81

Refactor: move method to Model.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4086 e93f8b46-1217-0410-a6f0-8f06a7374b81
8900797a · Eric Davis · 1b907031 · 8900797a · 8900797a · 8900797a
Commit 8900797a authored Sep 14, 2010 by Eric Davis
Hide whitespace changes
Inline Side-by-side

Showing with 25 additions and 2 deletions

timelog_controller.rb app/controllers/timelog_controller.rb +2 -2

time_entry.rb app/models/time_entry.rb +8 -0

time_entry_test.rb test/unit/time_entry_test.rb +15 -0

No files found.
--- a/app/controllers/timelog_controller.rb
+++ b/app/controllers/timelog_controller.rb
@@ -260,8 +260,8 @@ private
    end
    
    @from, @to = @to, @from if @from && @to && @from > @to
-    @from ||= (TimeEntry.minimum(:spent_on, :include => :project, :conditions => Project.allowed_to_condition(User.current, :view_time_entries)) || Date.today) - 1
-    @to   ||= (TimeEntry.maximum(:spent_on, :include => :project, :conditions => Project.allowed_to_condition(User.current, :view_time_entries)) || Date.today)
+    @from ||= (TimeEntry.earilest_date_for_project || Date.today) - 1
+    @to   ||= (TimeEntry.latest_date_for_project || Date.today)
  end

  def load_available_criterias

--- a/app/models/time_entry.rb
+++ b/app/models/time_entry.rb
@@ -81,4 +81,12 @@ class TimeEntry < ActiveRecord::Base
      yield
    end
  end
+
+  def self.earilest_date_for_project
+    TimeEntry.minimum(:spent_on, :include => :project, :conditions => Project.allowed_to_condition(User.current, :view_time_entries))
+  end
+
+  def self.latest_date_for_project
+    TimeEntry.maximum(:spent_on, :include => :project, :conditions => Project.allowed_to_condition(User.current, :view_time_entries))
+  end
 end
--- a/test/unit/time_entry_test.rb
+++ b/test/unit/time_entry_test.rb
@@ -48,4 +48,19 @@ class TimeEntryTest < ActiveSupport::TestCase
  def test_hours_should_default_to_nil
    assert_nil TimeEntry.new.hours
  end
+
+  context "#earilest_date_for_project" do
+    should "return the lowest spent_on value that is visible to the current user" do
+      User.current = nil
+      assert_equal "2007-03-12", TimeEntry.earilest_date_for_project.to_s
+    end
+  end
+
+  context "#latest_date_for_project" do
+    should "return the highest spent_on value that is visible to the current user" do
+      User.current = nil
+      assert_equal "2007-04-22", TimeEntry.latest_date_for_project.to_s
+    end
+  end
+  
 end