Skip to content
Extraits de code Groupes Projets
Valider 0ee41b3b rédigé par Arzumy MD's avatar Arzumy MD
Parcourir les fichiers

removed user variable from admins_controller#user_search

parent 93be5497
Aucune branche associée trouvée
Aucune étiquette associée trouvée
Aucune requête de fusion associée trouvée
...@@ -3,17 +3,9 @@ class AdminsController < ApplicationController ...@@ -3,17 +3,9 @@ class AdminsController < ApplicationController
before_filter :redirect_unless_admin before_filter :redirect_unless_admin
def user_search def user_search
user = params[:user] || {} params[:user] ||= {}
user = user.delete_if {|key, value| value.blank? } params[:user].delete_if {|key, value| value.blank? }
params[:user] = user @users = params[:user].empty? ? [] : User.where(params[:user])
if user.keys.count == 0
@users = []
else
@users = User.where(params[:user]).all || []
end
render 'user_search'
end end
def add_invites def add_invites
......
...@@ -23,9 +23,10 @@ describe AdminsController do ...@@ -23,9 +23,10 @@ describe AdminsController do
AppConfig[:admins] = [@user.username] AppConfig[:admins] = [@user.username]
end end
it 'succeeds' do it 'succeeds and renders user_search' do
get :user_search get :user_search
response.should be_success response.should be_success
response.should render_template(:user_search)
end end
it 'assigns users to an empty array if nothing is searched for' do it 'assigns users to an empty array if nothing is searched for' do
......
0% Chargement en cours ou .
You are about to add 0 people to the discussion. Proceed with caution.
Terminez d'abord l'édition de ce message.
Veuillez vous inscrire ou vous pour commenter