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

Replace will_paginate with kaminari. Fixed foodcoop/users page.

Browse source
This commit is contained in:
benni 2012-10-08 15:24:32 +02:00
parent 1708df3f6c
commit ab81ef09d5
17 changed files with 162 additions and 64 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -4,11 +4,16 @@ class Foodcoop::UsersController < ApplicationController
@users = User.order('nick ASC')
# if somebody uses the search field:
unless params[:query].blank?
@users = @users.where(({:first_name.matches => "%#{params[:query]}%"}) | ({:last_name.matches => "%#{params[:query]}%"}) | ({:nick.matches => "%#{params[:query]}%"}))
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.paginate(:page => params[:page], :per_page => @per_page)
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')
respond_to do |format|
format.html # index.html.haml