jro_apps/redmine Commit - r2868:a658679d29eb

Add etag check on the activity view to avoid rendering when not modified....

Jean-Philippe Lang -

r2868:a658679d29eb

parent child

Context file:

r2868:a658679d29eb

app/controllers/projects_controller.rb +2 0

                 events = @activity.events(@date_from, @date_to)
+                if events.empty? || stale?(:etag => [events.first, User.current])
                   respond_to do |format|
                     format.html {
                       @events_by_day = events.group_by(&:event_date)
                       render_feed(events, :title => "#{@project || Setting.app_title}: #{title}")
                     }
                   end
+                end
               rescue ActiveRecord::RecordNotFound
                 render_404

lib/redmine/activity/fetcher.rb +3 -1

                   end
                   # Returns an array of events for the given date range
+                  # sorted in reverse chronological order
                   def events(from = nil, to = nil, options={})
                     e = []
                     @options[:limit] = options[:limit]
                       end
                     end
+                    e.sort! {|a,b| b.event_datetime <=> a.event_datetime}
                     if options[:limit]
-                      e.sort! {|a,b| b.event_date <=> a.event_date}
                       e = e.slice(0, options[:limit])
                     end
                     e

General Comments 0

You need to be logged in to leave comments. Login now

No TODOs yet

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages