- backport from r65

git-svn-id: svn+ssh://svn.sourceforge.jp/svnroot/elecoma/trunk@66 06daa6dd-5c14-464e-8a85-0d68c524be32

diff --git a/app/models/order.rb b/app/models/order.rb
index 55861fa..869c7fa 100644 (file)
--- a/app/models/order.rb
+++ b/app/models/order.rb
@@ -58,7 +58,7 @@ class Order < ActiveRecord::Base
         search_list << ["order_deliveries.email like ?", "%#{search.email}%"]
       end
       unless search.tel.blank?
-        search_list << ["order_deliveries.tel01 || order_deliveries.tel02 || order_deliveries.tel03 like ?", "%#{search.tel}%"]
+        search_list << [MergeAdapterUtil.concat(["order_deliveries.tel01", "order_deliveries.tel02", "order_deliveries.tel03"]) + " like ?", "%#{search.tel}%"]
       end
       unless search.search_birth_from.blank?
         search_list << ["order_deliveries.birthday >= ?", search.search_birth_from]
@@ -80,17 +80,17 @@ class Order < ActiveRecord::Base
         search_list << ["order_deliveries.updated_at < ?", search.search_updated_at_to + 1 * 60 * 60 * 24 ]
       end
       unless search.total_from.blank?
-        if search.total_from =~ /^\d*$/
+        if search.total_from.to_s =~ /^\d*$/
           search_list << ["order_deliveries.total >= ?", search.total_from]
         else
-          search.errors.add nil, "購入金額は数字で入力してください。"
+          search.errors.add "購入金額は数字で入力してください。", ""
         end
       end
       unless search.total_to.blank?
-        if search.total_to =~ /^\d*$/
+        if search.total_to.to_s =~ /^\d*$/
           search_list << ["order_deliveries.total <= ?", search.total_to]
         else
-          search.errors.add nil, "購入金額は数字で入力してください。"
+          search.errors.add "購入金額は数字で入力してください。", ""
         end
       end
       unless search.product_code.blank?

diff --git a/app/models/product.rb b/app/models/product.rb
index 7bd358b..6eada2d 100644 (file)
--- a/app/models/product.rb
+++ b/app/models/product.rb
@@ -177,7 +177,7 @@ class Product < ActiveRecord::Base
             search_list << ["products.id = ?", 0]
           end
         else
-          search.errors.add nil, "商品IDは数字で入力して下さい。"
+          search.errors.add "商品IDは数字で入力して下さい。", ""
         end
       end
       unless search.code.blank?

diff --git a/spec/controllers/admin/orders_controller_spec.rb b/spec/controllers/admin/orders_controller_spec.rb
index 01705a6..4a7adce 100644 (file)
--- a/spec/controllers/admin/orders_controller_spec.rb
+++ b/spec/controllers/admin/orders_controller_spec.rb
@@ -150,6 +150,12 @@ describe Admin::OrdersController, "/admin/order" do
       post 'search', :search => {:product_code => code, :per_page => expected.size}
       assigns[:order_deliveries].should == expected
     end
+
+    it "電話番号(検索バグチェック用)" do
+      post 'search', :search => { :tel => "is_not_invalid_value" }
+      assigns[:order_deliveries].should == []
+    end
+
   end
 
   describe "編集" do