raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-02-27 01:43:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4925 from luisramos0/finders

Browse Source 
Adapt remaining AR finders to rails 4
This commit is contained in:
Maikel
2020-08-28 09:46:20 +10:00
committed by GitHub
parent 28651bbecf f8146fb946
commit d57f20a542
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/spree/admin/orders/customer_details_controller.rb
View File

@@ -51,7 +51,7 @@ module Spree
end
def load_order
@order = Order.find_by_number!(params[:order_id], include: :adjustments)
@order = Order.find_by!({ number: params[:order_id] }, include: :adjustments)
end
def check_authorization

2
app/controllers/spree/admin/resource_controller.rb
View File

@@ -178,7 +178,7 @@ module Spree
return nil if parent_data.blank?
@parent ||= parent_data[:model_class].
public_send("find_by_#{parent_data[:find_by]}", params["#{model_name}_id"])
public_send("find_by", parent_data[:find_by] => params["#{model_name}_id"])
instance_variable_set("@#{model_name}", @parent)
end