Don't load user activity for API responses (#18128).

git-svn-id: http://svn.redmine.org/redmine/trunk@13587 e93f8b46-1217-0410-a6f0-8f06a7374b81

diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index d62bea449d70cc99f2935c73faf9a374894fcb08..5a41c6dcc73eeb49abbc6db4c559dbb6de3cfda3 100644 (file)
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -68,11 +68,12 @@ class UsersController < ApplicationController
     # show projects based on current user visibility
     @memberships = @user.memberships.where(Project.visible_condition(User.current)).to_a
 
-    events = Redmine::Activity::Fetcher.new(User.current, :author => @user).events(nil, nil, :limit => 10)
-    @events_by_day = events.group_by(&:event_date)
-
     respond_to do |format|
-      format.html { render :layout => 'base' }
+      format.html {
+        events = Redmine::Activity::Fetcher.new(User.current, :author => @user).events(nil, nil, :limit => 10)
+        @events_by_day = events.group_by(&:event_date)
+        render :layout => 'base'
+      }
       format.api
     end
   end