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

Fixed foodcoop/ordergroups view.

Browse source
This commit is contained in:
benni 2011-05-18 11:47:00 +02:00
parent 2ee30fee16
commit 6ac04d5e19
3 changed files with 22 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

19
app/controllers/foodcoop/ordergroups_controller.rb
View file

@ -7,23 +7,16 @@ class Foodcoop::OrdergroupsController < ApplicationController
@per_page = 20
end
if (params[:only_active].to_i == 1)
if (! params[:query].blank?)
conditions = ["orders.starts >= ? AND name LIKE ?", Time.now.months_ago(3), "%#{params[:query]}%"]
else
conditions = ["orders.starts >= ?", Time.now.months_ago(3)]
end
else
# if somebody uses the search field:
conditions = ["name LIKE ?", "%#{params[:query]}%"] unless params[:query].blank?
end
@ordergroups = Ordergroup.order(:name.desc)
@ordergroups = @ordergroups.where(:name.matches => "%#{params[:query]}%") unless params[:query].blank? # Search by name
@ordergroups = @ordergroups.joins(:orders).where(:orders => {:starts.gte => Time.now.months_ago(3)}) if params[:only_active] # Select only active groups
@total = Ordergroup.count(:conditions => conditions, :include => "orders")
@ordergroups = Ordergroup.paginate(:page => params[:page], :per_page => @per_page, :conditions => conditions, :order => "name", :include => "orders")
@total = @ordergroups.size
@ordergroups = @ordergroups.paginate(:page => params[:page], :per_page => @per_page)
respond_to do |format|
format.html # index.html.erb
format.js { render :partial => "ordergroups" }
format.js { render :layout => false }
end
end
end