|
|
@@ -5,7 +5,7 @@ class ActivitiesController < ApplicationController |
|
|
|
|
|
|
|
def index |
|
|
|
@days = Setting.activity_days_default.to_i |
|
|
|
|
|
|
|
|
|
|
|
if params[:from] |
|
|
|
begin; @date_to = params[:from].to_date + 1; rescue; end |
|
|
|
end |
|
|
@@ -14,18 +14,18 @@ class ActivitiesController < ApplicationController |
|
|
|
@date_from = @date_to - @days |
|
|
|
@with_subprojects = params[:with_subprojects].nil? ? Setting.display_subprojects_issues? : (params[:with_subprojects] == '1') |
|
|
|
@author = (params[:user_id].blank? ? nil : User.active.find(params[:user_id])) |
|
|
|
|
|
|
|
@activity = Redmine::Activity::Fetcher.new(User.current, :project => @project, |
|
|
|
|
|
|
|
@activity = Redmine::Activity::Fetcher.new(User.current, :project => @project, |
|
|
|
:with_subprojects => @with_subprojects, |
|
|
|
:author => @author) |
|
|
|
@activity.scope_select {|t| !params["show_#{t}"].nil?} |
|
|
|
@activity.scope = (@author.nil? ? :default : :all) if @activity.scope.empty? |
|
|
|
|
|
|
|
events = @activity.events(@date_from, @date_to) |
|
|
|
|
|
|
|
|
|
|
|
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 { |
|
|
|
format.html { |
|
|
|
@events_by_day = events.group_by(&:event_date) |
|
|
|
render :layout => false if request.xhr? |
|
|
|
} |
|
|
@@ -40,7 +40,7 @@ class ActivitiesController < ApplicationController |
|
|
|
} |
|
|
|
end |
|
|
|
end |
|
|
|
|
|
|
|
|
|
|
|
rescue ActiveRecord::RecordNotFound |
|
|
|
render_404 |
|
|
|
end |
|
|
@@ -55,5 +55,4 @@ class ActivitiesController < ApplicationController |
|
|
|
rescue ActiveRecord::RecordNotFound |
|
|
|
render_404 |
|
|
|
end |
|
|
|
|
|
|
|
end |