From efb32f49cfcbd368f5d2e52f99f83dede3734dda Mon Sep 17 00:00:00 2001 From: Jan Schulz-Hofen Date: Sat, 18 Oct 2014 15:53:38 +0200 Subject: [PATCH] Make User profile 404 rendering more consistent (and speed up Users#show API) --- app/controllers/users_controller.rb | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index c5db589..c2266e9 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -62,18 +62,17 @@ class UsersController < ApplicationController # show projects based on current user visibility @memberships = @user.memberships.where(Project.visible_condition(User.current)).all - events = Redmine::Activity::Fetcher.new(User.current, :author => @user).events(nil, nil, :limit => 10) - @events_by_day = events.group_by(&:event_date) - - unless User.current.admin? - if !@user.active? || (@user != User.current && @memberships.empty? && events.empty?) - render_404 - return - end + if !@user.active? && !User.current.admin? + render_404 + return end respond_to do |format| - format.html { render :layout => 'base' } + format.html do + 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' + end format.api end end -- 1.7.12