fix userlist sorting; fix idiot-check
This commit is contained in:
@@ -11,10 +11,9 @@ class UsersController < ApplicationController
|
|||||||
@users = User.where(role: Role.get(params[:role]))
|
@users = User.where(role: Role.get(params[:role]))
|
||||||
end
|
end
|
||||||
else
|
else
|
||||||
@users = User.all.to_a
|
@users = User.where.not(id: User.first.id) #Remove first user
|
||||||
@users.shift #Remove first user
|
|
||||||
end
|
end
|
||||||
@users = @users.to_a.sort_by{|u| u.role}.reverse!
|
@users = @users.order("role_id desc", :name).to_a
|
||||||
end
|
end
|
||||||
|
|
||||||
def show
|
def show
|
||||||
|
|||||||
@@ -89,7 +89,7 @@ class User < ActiveRecord::Base
|
|||||||
payload = { agent: { name: "Minecraft", version: 1 }, username: self.email, password: password }
|
payload = { agent: { name: "Minecraft", version: 1 }, username: self.email, password: password }
|
||||||
begin
|
begin
|
||||||
response = http.post(uri.request_uri, payload.to_json, "Content-Type" => "application/json").code
|
response = http.post(uri.request_uri, payload.to_json, "Content-Type" => "application/json").code
|
||||||
if response.code == "200"
|
if response == "200"
|
||||||
return true
|
return true
|
||||||
else
|
else
|
||||||
payload[:username] = self.ign
|
payload[:username] = self.ign
|
||||||
|
|||||||
Reference in New Issue
Block a user