From 16b3d26d7b6446067e1e374625144df00089b991 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9gis=20Hanol?= Date: Fri, 27 Nov 2015 20:02:24 +0100 Subject: [PATCH] allow staff members to view staged accounts user card/profile --- app/controllers/application_controller.rb | 1 - app/controllers/list_controller.rb | 2 +- app/controllers/user_actions_controller.rb | 2 +- app/controllers/users_controller.rb | 4 ++-- 4 files changed, 4 insertions(+), 5 deletions(-) diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index b9e59715115..b3244816580 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -231,7 +231,6 @@ class ApplicationController < ActionController::Base end end - render json: MultiJson.dump(obj), status: opts[:status] || 200 end diff --git a/app/controllers/list_controller.rb b/app/controllers/list_controller.rb index f700c81d8aa..03d78cb2114 100644 --- a/app/controllers/list_controller.rb +++ b/app/controllers/list_controller.rb @@ -105,7 +105,7 @@ class ListController < ApplicationController [:topics_by, :private_messages, :private_messages_sent, :private_messages_unread].each do |action| define_method("#{action}") do list_opts = build_topic_list_options - target_user = fetch_user_from_params + target_user = fetch_user_from_params(include_inactive: current_user.try(:staff?)) guardian.ensure_can_see_private_messages!(target_user.id) unless action == :topics_by list = generate_list_for(action.to_s, target_user, list_opts) url_prefix = "topics" unless action == :topics_by diff --git a/app/controllers/user_actions_controller.rb b/app/controllers/user_actions_controller.rb index c20f9c8d23d..6a823e7e541 100644 --- a/app/controllers/user_actions_controller.rb +++ b/app/controllers/user_actions_controller.rb @@ -6,7 +6,7 @@ class UserActionsController < ApplicationController per_chunk = 60 - user = fetch_user_from_params + user = fetch_user_from_params(include_inactive: current_user.try(:staff?)) opts = { user_id: user.id, user: user, diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index 163a3f0b73b..5b53649d1cf 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -31,7 +31,7 @@ class UsersController < ApplicationController def show raise Discourse::InvalidAccess if SiteSetting.hide_user_profiles_from_public && !current_user - @user = fetch_user_from_params + @user = fetch_user_from_params(include_inactive: current_user.try(:staff?)) user_serializer = UserSerializer.new(@user, scope: guardian, root: 'user') if params[:stats].to_s == "false" user_serializer.omit_stats = true @@ -621,7 +621,7 @@ class UsersController < ApplicationController end def staff_info - @user = fetch_user_from_params + @user = fetch_user_from_params(include_inactive: true) guardian.ensure_can_see_staff_info!(@user) result = {}