Foodsoft/foodsoft
1
1
Fork 0
Code Issues 36 Pull requests 5 Projects 1 Releases Wiki Activity

make search work without nickname usage

Browse source
This commit is contained in:
wvengen 2013-09-20 23:18:06 +02:00
parent 17c1ee803f
commit 6d3db7636a
4 changed files with 22 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

9
app/controllers/foodcoop/users_controller.rb
View file

@ -1,19 +1,16 @@
class Foodcoop::UsersController < ApplicationController
def index
@users = User.order('nick ASC')
@users = User.natural_order
# if somebody uses the search field:
unless params[:user_name].blank?
@users = @users.where("first_name LIKE :user_name OR last_name LIKE :user_name OR nick LIKE :user_name",
user_name: "%#{params[:user_name]}%")
end
@users = @users.natural_search(params[:user_name]) unless params[:user_name].blank?
if params[:ordergroup_name]
@users = @users.joins(:groups).where("groups.type = 'Ordergroup' AND groups.name LIKE ?", "%#{params[:ordergroup_name]}%")
end
@users = @users.page(params[:page]).per(@per_page).order('users.nick ASC')
@users = @users.page(params[:page]).per(@per_page)
respond_to do |format|
format.html # index.html.haml