Mercurial > hg > soundsoftware-site
diff app/controllers/activities_controller.rb @ 119:8661b858af72
* Update to Redmine trunk rev 4705
author | Chris Cannam |
---|---|
date | Thu, 13 Jan 2011 14:12:06 +0000 |
parents | 40f7cfd4df19 |
children | cbce1fd3b1b7 |
line wrap: on
line diff
--- a/app/controllers/activities_controller.rb Fri Nov 19 14:05:24 2010 +0000 +++ b/app/controllers/activities_controller.rb Thu Jan 13 14:12:06 2011 +0000 @@ -23,7 +23,7 @@ events = @activity.events(@date_from, @date_to) - if events.empty? || stale?(:etag => [events.first, User.current]) + if events.empty? || stale?(:etag => [@activity.scope, @date_to, @date_from, @with_subprojects, @author, events.first, User.current, current_language]) respond_to do |format| format.html { @events_by_day = events.group_by(&:event_date)