Added ban reason #41

Merged
bruncbrunc merged 7 commits from bna into master 2017-10-31 22:20:56 -04:00
2 changed files with 6 additions and 3 deletions
Showing only changes of commit 2223f88d7b - Show all commits

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"

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