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

Fixed admin, orders, wiki views. Converted all erb to haml.

Browse source
This commit is contained in:
benni 2012-10-15 21:19:17 +02:00
parent 699fb9b233
commit 552c553b77
169 changed files with 1158 additions and 1307 deletions
Download patch file Download diff file Expand all files Collapse all files

15
app/controllers/orders_controller.rb
View file

@ -20,18 +20,7 @@ class OrdersController < ApplicationController
else
sort = "ends DESC"
end
@orders = Order.paginate :page => params[:page], :per_page => @per_page,
:order => sort, :conditions => "state != 'open'",
:include => :supplier
respond_to do |format|
format.html
format.js do
render :update do |page|
page.replace_html 'orders_table', :partial => "orders"
end
end
end
@orders = Order.page(params[:page]).per(@per_page).order(sort).where("state != 'open'").includes(:supplier)
end
# Gives a view for the results to a specific order
@ -43,7 +32,7 @@ class OrdersController < ApplicationController
format.html
format.js do
@partial = case params[:view]
when 'normal' then "articles"
when 'default' then "articles"
when 'groups'then 'shared/articles_by_groups'
when 'articles'then 'shared/articles_by_articles'
else 'articles'