lino.jorzick/greenlight
1
0
Fork 0
forked from External/greenlight
Code Issues Pull Requests Projects Releases Wiki Activity

GRN2-xx: Cleaned up manage users query (#1786)

Browse Source 
* Cleaned up manage users query

* Bring back filter by role
This commit is contained in:
Ahmad Farhat
2020-06-12 10:01:53 -04:00
committed by GitHub
parent a32a383b65
commit b84f10a51a
3 changed files with 14 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/controllers/admins_controller.rb
View File

@ -37,9 +37,8 @@ class AdminsController < ApplicationController
@search = params[:search] || ""
@order_column = params[:column] && params[:direction] != "none" ? params[:column] : "created_at"
@order_direction = params[:direction] && params[:direction] != "none" ? params[:direction] : "DESC"
@role = params[:role] ? Role.find_by(name: params[:role], provider: @user_domain) : nil
@tab = params[:tab] || "active"
@role = params[:role] ? Role.find_by(name: params[:role], provider: @user_domain) : nil
@user_list = merge_user_list