Mercurial > hg > soundsoftware-site
diff app/controllers/.svn/text-base/timelog_controller.rb.svn-base @ 22:40f7cfd4df19
* Update to SVN trunk rev 4173
author | Chris Cannam <chris.cannam@soundsoftware.ac.uk> |
---|---|
date | Fri, 24 Sep 2010 14:06:04 +0100 |
parents | 1d32c0a0efbf |
children | 94944d00e43c |
line wrap: on
line diff
--- a/app/controllers/.svn/text-base/timelog_controller.rb.svn-base Wed Aug 25 16:30:24 2010 +0100 +++ b/app/controllers/.svn/text-base/timelog_controller.rb.svn-base Fri Sep 24 14:06:04 2010 +0100 @@ -260,8 +260,8 @@ 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(@project) || Date.today) + @to ||= (TimeEntry.latest_date_for_project(@project) || Date.today) end def load_available_criterias