fix user list ranking
This commit is contained in:
@@ -12,7 +12,7 @@ class UsersController < ApplicationController
|
|||||||
@users = User.joins(:role).where("roles.value >= ?", Role.get(:mod).to_i)
|
@users = User.joins(:role).where("roles.value >= ?", Role.get(:mod).to_i)
|
||||||
else
|
else
|
||||||
if role = Role.get(params[:role])
|
if role = Role.get(params[:role])
|
||||||
@users = User.where(role: role)
|
@users = User.joins(:role).where(role: role)
|
||||||
else
|
else
|
||||||
flash[:alert] = "role '#{params[:role]}' does not exist!"
|
flash[:alert] = "role '#{params[:role]}' does not exist!"
|
||||||
redirect_to users_path
|
redirect_to users_path
|
||||||
@@ -20,9 +20,9 @@ class UsersController < ApplicationController
|
|||||||
end
|
end
|
||||||
end
|
end
|
||||||
else
|
else
|
||||||
@users = User.where.not(id: User.first.id) #Remove first user
|
@users = User.joins(:role).where.not(id: User.first.id) #Remove first user
|
||||||
end
|
end
|
||||||
@users = @users.order("role_id desc", "confirmed desc", :name)
|
@users = @users.order("roles.value desc", "confirmed desc", :name)
|
||||||
@count = @users.size
|
@count = @users.size
|
||||||
@users = @users.page(params[:page]).per(100)
|
@users = @users.page(params[:page]).per(100)
|
||||||
end
|
end
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
<h1>
|
<h1>
|
||||||
<% if params[:role] %>
|
<% if params[:role] %>
|
||||||
<%= title "All #{params[:role]}-role users" %>
|
<%= title "All '#{params[:role]}' users" %>
|
||||||
<% else %>
|
<% else %>
|
||||||
<%= title "All Users" %>
|
<%= title "All Users" %>
|
||||||
<% end %>
|
<% end %>
|
||||||
|
|||||||
Reference in New Issue
Block a user