jaculabilis/danbooru
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

ignore privacy mode settings for admins

Browse Source
This commit is contained in:
r888888888
2017-03-09 13:52:46 -08:00
parent 537a293761
commit 97cc8b5931
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/models/user.rb
View File

@@ -914,7 +914,7 @@ class User < ActiveRecord::Base
end end
def hide_favorites? def hide_favorites?
enable_privacy_mode? && CurrentUser.user.id != id !CurrentUser.is_admin? && enable_privacy_mode? && CurrentUser.user.id != id
end end
def initialize_default_boolean_attributes def initialize_default_boolean_attributes

2
app/views/users/show.html.erb
View File

@@ -4,7 +4,7 @@
<%= render "statistics", :presenter => @presenter, :user => @user %> <%= 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 %> <%= render "post_summary", :presenter => @presenter, :user => @user %>
<% end %> <% end %>
</div> </div>