summaryrefslogtreecommitdiffstats
path: root/app/controllers/activities_controller.rb
diff options
context:
space:
mode:
authorJean-Philippe Lang <jp_lang@yahoo.fr>2010-12-29 19:37:42 +0000
committerJean-Philippe Lang <jp_lang@yahoo.fr>2010-12-29 19:37:42 +0000
commite9a0e6dbc8bff4afbd299d23431944fbab453e17 (patch)
tree0f7b761ad1b134c3e75ad6e547a2b288d1368eda /app/controllers/activities_controller.rb
parentaf7006dff6f8ee4e74a3ec793fe0457f2d5a41e7 (diff)
downloadredmine-e9a0e6dbc8bff4afbd299d23431944fbab453e17.tar.gz
redmine-e9a0e6dbc8bff4afbd299d23431944fbab453e17.zip
Takes more parameters into account to determine activity freshness (#7188).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4579 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app/controllers/activities_controller.rb')
-rw-r--r--app/controllers/activities_controller.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/activities_controller.rb b/app/controllers/activities_controller.rb
index ae6a67369..d6292ea9a 100644
--- a/app/controllers/activities_controller.rb
+++ b/app/controllers/activities_controller.rb
@@ -23,7 +23,7 @@ class ActivitiesController < ApplicationController
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)