From 1a328e9567f123e43ae8d6c9bbf0bffc65adf2da Mon Sep 17 00:00:00 2001 From: Rohan Mitchell Date: Tue, 20 Aug 2013 15:01:58 +1000 Subject: [PATCH] Simplify syntax --- app/models/order_cycle.rb | 2 +- app/models/spree/order_decorator.rb | 2 +- app/models/spree/payment_method_decorator.rb | 4 ++-- app/models/spree/product_decorator.rb | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/app/models/order_cycle.rb b/app/models/order_cycle.rb index 88bcdefd7e..e52bb01dc8 100644 --- a/app/models/order_cycle.rb +++ b/app/models/order_cycle.rb @@ -24,7 +24,7 @@ class OrderCycle < ActiveRecord::Base if user.has_spree_role?('admin') scoped else - where('coordinator_id IN (?)', user.enterprises.map {|enterprise| enterprise.id }) + where('coordinator_id IN (?)', user.enterprises) end } diff --git a/app/models/spree/order_decorator.rb b/app/models/spree/order_decorator.rb index f3ae861c84..5c28f5f510 100644 --- a/app/models/spree/order_decorator.rb +++ b/app/models/spree/order_decorator.rb @@ -20,7 +20,7 @@ Spree::Order.class_eval do if user.has_spree_role?('admin') scoped else - where('distributor_id IN (?)', user.enterprises.map {|enterprise| enterprise.id }) + where('distributor_id IN (?)', user.enterprises) end } diff --git a/app/models/spree/payment_method_decorator.rb b/app/models/spree/payment_method_decorator.rb index f8759ac06b..6e0c6658bd 100644 --- a/app/models/spree/payment_method_decorator.rb +++ b/app/models/spree/payment_method_decorator.rb @@ -10,7 +10,7 @@ Spree::PaymentMethod.class_eval do if user.has_spree_role?('admin') scoped else - where('distributor_id IN (?)', user.enterprises.map {|enterprise| enterprise.id }) + where('distributor_id IN (?)', user.enterprises) end } end @@ -18,4 +18,4 @@ end # Ensure that all derived classes also allow distributor_id Spree::Gateway.providers.each do |p| p.attr_accessible :distributor_id -end \ No newline at end of file +end diff --git a/app/models/spree/product_decorator.rb b/app/models/spree/product_decorator.rb index dc0b1bbf35..b60bd2f7cd 100644 --- a/app/models/spree/product_decorator.rb +++ b/app/models/spree/product_decorator.rb @@ -61,7 +61,7 @@ Spree::Product.class_eval do if user.has_spree_role?('admin') scoped else - where('supplier_id IN (?)', user.enterprises.map {|enterprise| enterprise.id }) + where('supplier_id IN (?)', user.enterprises) end }