removed user variable from admins_controller#user_search
This commit is contained in:
parent
93be5497a7
commit
0ee41b3be5
2 changed files with 5 additions and 12 deletions
|
|
@ -3,17 +3,9 @@ class AdminsController < ApplicationController
|
|||
before_filter :redirect_unless_admin
|
||||
|
||||
def user_search
|
||||
user = params[:user] || {}
|
||||
user = user.delete_if {|key, value| value.blank? }
|
||||
params[:user] = user
|
||||
|
||||
if user.keys.count == 0
|
||||
@users = []
|
||||
else
|
||||
@users = User.where(params[:user]).all || []
|
||||
end
|
||||
|
||||
render 'user_search'
|
||||
params[:user] ||= {}
|
||||
params[:user].delete_if {|key, value| value.blank? }
|
||||
@users = params[:user].empty? ? [] : User.where(params[:user])
|
||||
end
|
||||
|
||||
def add_invites
|
||||
|
|
|
|||
|
|
@ -23,9 +23,10 @@ describe AdminsController do
|
|||
AppConfig[:admins] = [@user.username]
|
||||
end
|
||||
|
||||
it 'succeeds' do
|
||||
it 'succeeds and renders user_search' do
|
||||
get :user_search
|
||||
response.should be_success
|
||||
response.should render_template(:user_search)
|
||||
end
|
||||
|
||||
it 'assigns users to an empty array if nothing is searched for' do
|
||||
|
|
|
|||
Loading…
Reference in a new issue