Mercurial > hg > soundsoftware-site

diff app/controllers/.svn/text-base/activities_controller.rb.svn-base @ 117:af80e5618e9b redmine-1.1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
* Update to Redmine 1.1-stable branch (Redmine SVN rev 4707)
author Chris Cannam
date Thu, 13 Jan 2011 12:53:21 +0000
parents 40f7cfd4df19
children cbce1fd3b1b7
line wrap: on
line diff
--- a/app/controllers/.svn/text-base/activities_controller.rb.svn-base	Fri Nov 19 14:05:24 2010 +0000
+++ b/app/controllers/.svn/text-base/activities_controller.rb.svn-base	Thu Jan 13 12:53:21 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)