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

Added ban reason #41

Merged
bruncbrunc merged 7 commits from bna into master 2017-10-31 22:20:56 -04:00
Conversation 1 Commits 7 Files Changed 2
+6 -3
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 2223f88d7b - Show all commits
app/controllers/users_controller.rb
+2
View File
@@ -6,6 +6,8 @@ class UsersController < ApplicationController
before_filter :set_user, except: [:index, :new, :create, :lost_password, :reset_password, :suggestions] before_filter :set_user, except: [:index, :new, :create, :lost_password, :reset_password, :suggestions]
caches_action :show, expires_in: 10.seconds, layout: false
def index def index
if params[:role] if params[:role]
if params[:role].downcase == "staff" if params[:role].downcase == "staff"
1
app/views/users/show.html.erb
+4 -3
View File
3
 @@ -16,9 +16,10 @@
<div class="clear"></div> <div class="clear"></div>
<% if @ban_json %> <% 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> <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>
<% elsif @user.banned? %> <% end %>
<span class="user-banned">This user is banned!</span> <% if @user.banned? %>
<span class="user-banned">This user is banned on the website!</span>
<% end %> <% end %>
<br> <br>
<% if !@user.confirmed? %> <% if !@user.confirmed? %>