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

allowed role and badge filtering, made User.search take Role and Badge as params

Browse Source
This commit is contained in:
MrYummy
2017-06-02 18:19:06 +02:00
parent d2de01100a
commit 9837f12b59
3 changed files with 17 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/controllers/users_controller.rb
View File

@@ -7,11 +7,10 @@ class UsersController < ApplicationController
before_filter :set_user, except: [:index, :new, :create, :lost_password, :reset_password, :suggestions]
def index
role = Role.find_by(name: params[:role]) unless role.try(:downcase) == "staff"
role = Role.find_by(name: params[:role])
badge = Badge.find_by(name: params[:badge])
@users = User.search(params[:search], role, badge)
@users = @users.order("roles.value desc", "confirmed desc", :name) unless params[:badge]
@users = User.search(params[:search], role, badge, params[:staff])
@count = @users.size
@users = @users.page(params[:page]).per(100)
end