events = @activity.events(@date_from, @date_to)
- respond_to do |format|
- format.html {
- @events_by_day = events.group_by(&:event_date)
- render :layout => false if request.xhr?
- }
- format.atom {
- title = l(:label_activity)
- if @author
- title = @author.name
- elsif @activity.scope.size == 1
- title = l("label_#{@activity.scope.first.singularize}_plural")
- end
- render_feed(events, :title => "#{@project || Setting.app_title}: #{title}")
- }
+ if events.empty? || stale?(:etag => [events.first, User.current])
+ respond_to do |format|
+ format.html {
+ @events_by_day = events.group_by(&:event_date)
+ render :layout => false if request.xhr?
+ }
+ format.atom {
+ title = l(:label_activity)
+ if @author
+ title = @author.name
+ elsif @activity.scope.size == 1
+ title = l("label_#{@activity.scope.first.singularize}_plural")
+ end
+ render_feed(events, :title => "#{@project || Setting.app_title}: #{title}")
+ }
+ end
end
rescue ActiveRecord::RecordNotFound
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