Merge pull request #41.

This commit is contained in:
Logan Fick
2017-10-31 22:19:34 -04:00
2 changed files with 14 additions and 4 deletions

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
role = Role.find_by(name: params[:role])
badge = Badge.find_by(name: params[:badge])
@@ -16,6 +18,12 @@ class UsersController < ApplicationController
end
def show
begin
@ban_json = JSON.parse(File.read("/etc/minecraft/redstoner/banned-players.json")).detect {|u| u["uuid"].tr("-", "") == @user.uuid}
rescue
flash.now[:alert] = "An error occured while checking if this user is banned from the server!"
@ban_json = nil
end
end
# SIGNUP