diff options
| -rw-r--r-- | app/controllers/users_controller.rb | 2 | ||||
| -rw-r--r-- | app/views/users/show.html.erb | 7 |
2 files changed, 6 insertions, 3 deletions
diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index e188d01..cc77c44 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -6,6 +6,8 @@ class UsersController < ApplicationController before_filter :set_user, except: [:index, :new, :create, :lost_password, :reset_password, :suggestions] + caches_action :show, expires_in: 10.seconds, layout: false + def index if params[:role] if params[:role].downcase == "staff" diff --git a/app/views/users/show.html.erb b/app/views/users/show.html.erb index 3d9dcfe..de784a2 100644 --- a/app/views/users/show.html.erb +++ b/app/views/users/show.html.erb @@ -16,9 +16,10 @@ <div class="clear"></div> <% if @ban_json %> - <span class="user-banned">This user is banned for "<%=@ban_json["reason"]%>"<%=" until #{@ban_json["expires"]}" unless @ban_json["expires"] == "forever"%></span> - <% elsif @user.banned? %> - <span class="user-banned">This user is banned!</span> + <span class="user-banned">This user is banned on the server for "<%=@ban_json["reason"]%>"<%=" until #{@ban_json["expires"]}" unless @ban_json["expires"] == "forever"%></span> + <% end %> + <% if @user.banned? %> + <span class="user-banned">This user is banned on the website!</span> <% end %> <br> <% if !@user.confirmed? %> |