Redstoner/redstoner.com
Archived
0
Fork 0
Code Issues Pull Requests 2 Wiki Activity

minor edits

Browse Source
This commit is contained in:
MrYummy
2017-10-26 22:21:00 +02:00
parent bd85a2c3ae
commit 2223f88d7b
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/users_controller.rb
View File

@@ -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"

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

@@ -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? %>