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

Fixed foodcoop/ordergroups and workgroups views.

Browse source
This commit is contained in:
benni 2012-10-08 16:20:24 +02:00
parent ab81ef09d5
commit c0c41a7752
7 changed files with 63 additions and 75 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -2,11 +2,16 @@ class Foodcoop::OrdergroupsController < ApplicationController
def index
@ordergroups = Ordergroup.order('name DESC')
@ordergroups = @ordergroups.where('name LIKE ?', "%#{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 = @ordergroups.size
@ordergroups = @ordergroups.paginate(:page => params[:page], :per_page => @per_page)
unless params[:name].blank? # Search by name
@ordergroups = @ordergroups.where('name LIKE ?', "%#{params[:name]}%")
end
if params[:only_active] # Select only active groups
@ordergroups = @ordergroups.joins(:orders).where("orders.starts >= ?", Time.now.months_ago(3)).uniq
end
@ordergroups = @ordergroups.page(params[:page]).per(@per_page)
respond_to do |format|
format.html # index.html.erb