From c4376f35bf5e3d0215ba9ec9f93c949b4c1152e4 Mon Sep 17 00:00:00 2001 From: Benjamin Meichsner Date: Tue, 12 Mar 2013 12:50:56 +0100 Subject: [PATCH] Removed article from includes in as it does not work with acts_as_paranoid. See also https://github.com/goncalossilva/rails3_acts_as_paranoid/issues/62. Better we remove acts_as_paranoid and filter manually? --- app/controllers/finance/balancing_controller.rb | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/app/controllers/finance/balancing_controller.rb b/app/controllers/finance/balancing_controller.rb index 8f40a017..18031dbd 100644 --- a/app/controllers/finance/balancing_controller.rb +++ b/app/controllers/finance/balancing_controller.rb @@ -21,10 +21,9 @@ class Finance::BalancingController < Finance::BaseController sort = "id" end - @articles = @order.order_articles.ordered.includes(:order, :article, :article_price, + @articles = @order.order_articles.ordered.includes(:order, :article_price, group_order_articles: {group_order: :ordergroup}).order(sort) - if params[:sort] == "order_number" @articles = @articles.to_a.sort { |a,b| a.article.order_number.gsub(/[^[:digit:]]/, "").to_i <=> b.article.order_number.gsub(/[^[:digit:]]/, "").to_i } elsif params[:sort] == "order_number_reverse"