From 55e8dace446c58e76c2077e4b820532146ffefa0 Mon Sep 17 00:00:00 2001 From: Luis Ramos Date: Thu, 6 Aug 2020 20:51:53 +0100 Subject: [PATCH] Fix sort_by issue on relation by calling to_a --- app/controllers/spree/admin/shipping_methods_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/controllers/spree/admin/shipping_methods_controller.rb b/app/controllers/spree/admin/shipping_methods_controller.rb index 14f7654177..cace3feea4 100644 --- a/app/controllers/spree/admin/shipping_methods_controller.rb +++ b/app/controllers/spree/admin/shipping_methods_controller.rb @@ -50,7 +50,7 @@ module Spree def load_hubs # rubocop:disable Style/TernaryParentheses - @hubs = Enterprise.managed_by(spree_current_user).is_distributor.sort_by! do |d| + @hubs = Enterprise.managed_by(spree_current_user).is_distributor.to_a.sort_by! do |d| [(@shipping_method.has_distributor? d) ? 0 : 1, d.name] end # rubocop:enable Style/TernaryParentheses