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

migrate to Rails 4.0 (closes foodcoops#214)

Browse source 
Conflicts:
	Gemfile.lock
This commit is contained in:
wvengen 2014-02-20 15:04:53 +01:00
parent 12d1221bfc
commit 7841245795
97 changed files with 659 additions and 557 deletions
Download patch file Download diff file Expand all files Collapse all files

8
app/controllers/finance/balancing_controller.rb
View file

@ -16,13 +16,13 @@ class Finance::BalancingController < Finance::BaseController
sort_param = params['sort'] || 'name'
@articles = case sort_param
when 'name' then
OrderArticle.sort_by_name(@articles)
@articles.order('articles.name ASC')
when 'name_reverse' then
OrderArticle.sort_by_name(@articles).reverse
@articles.order('articles.name DESC')
when 'order_number' then
OrderArticle.sort_by_order_number(@articles)
@articles.order('articles.order_number ASC')
when 'order_number_reverse' then
OrderArticle.sort_by_order_number(@articles).reverse
@articles.order('articles.order_number DESC')
else
@articles
end