From 97cc8b59316fa4e9752a653b90b47b73ffbc06ef Mon Sep 17 00:00:00 2001 From: r888888888 Date: Thu, 9 Mar 2017 13:52:46 -0800 Subject: [PATCH] ignore privacy mode settings for admins --- app/models/user.rb | 2 +- app/views/users/show.html.erb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/models/user.rb b/app/models/user.rb index 722e1f350..68e633f9f 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -914,7 +914,7 @@ class User < ActiveRecord::Base end def hide_favorites? - enable_privacy_mode? && CurrentUser.user.id != id + !CurrentUser.is_admin? && enable_privacy_mode? && CurrentUser.user.id != id end def initialize_default_boolean_attributes diff --git a/app/views/users/show.html.erb b/app/views/users/show.html.erb index c947ef44c..a425779bb 100644 --- a/app/views/users/show.html.erb +++ b/app/views/users/show.html.erb @@ -4,7 +4,7 @@ <%= render "statistics", :presenter => @presenter, :user => @user %> - <% if !@user.enable_privacy_mode? || CurrentUser.id == @user.id %> + <% if !CurrentUser.is_admin? && !@user.enable_privacy_mode? || CurrentUser.id == @user.id %> <%= render "post_summary", :presenter => @presenter, :user => @user %> <% end %>