商品削除後に該当商品を含む在庫操作履歴/返品履歴を検索するとエラーが発生するバグを修正

diff --git a/app/controllers/admin/return_items_controller.rb b/app/controllers/admin/return_items_controller.rb
index 9fb2b7d..6c4adbe 100644 (file)
--- a/app/controllers/admin/return_items_controller.rb
+++ b/app/controllers/admin/return_items_controller.rb
@@ -149,7 +149,8 @@ class Admin::ReturnItemsController < Admin::BaseController
     find_options = {
       :page => params[:page], 
       :per_page => @condition.per_page || 10,
-      :conditions => flatten_conditions(@search_list),
+      :conditions => ['product_styles.deleted_at IS NULL'] + flatten_conditions(@search_list),
+      :joins=> :product_style,
       :include => [:product],
       :order => "return_items.id"
     }

diff --git a/app/controllers/admin/stock_histories_controller.rb b/app/controllers/admin/stock_histories_controller.rb
index 5ee5e2e..f43af05 100644 (file)
--- a/app/controllers/admin/stock_histories_controller.rb
+++ b/app/controllers/admin/stock_histories_controller.rb
@@ -16,7 +16,8 @@ class Admin::StockHistoriesController < Admin::BaseController
     find_options = {
       :page => params[:page],
       :per_page => @condition.per_page || 10,
-      :conditions => flatten_conditions(@search_list),
+      :conditions => ['product_styles.deleted_at IS NULL'] + flatten_conditions(@search_list),
+      :joins => :product_style,
       :include => [:product],
       :order => "stock_histories.id"
     }