From dde775d2b7946532d9eda035600504cd9d338791 Mon Sep 17 00:00:00 2001 From: Neal Chambers Date: Thu, 8 Jun 2023 09:26:38 +0900 Subject: [PATCH] Remove Old Code and Comments --- app/controllers/admin/enterprise_fees_controller.rb | 1 - app/controllers/admin/enterprises_controller.rb | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/app/controllers/admin/enterprise_fees_controller.rb b/app/controllers/admin/enterprise_fees_controller.rb index 3281b67317..6eab5c143d 100644 --- a/app/controllers/admin/enterprise_fees_controller.rb +++ b/app/controllers/admin/enterprise_fees_controller.rb @@ -25,7 +25,6 @@ module Admin format.json { render_as_json @collection, controller: self, include_calculators: @include_calculators } - # format.json { @presented_collection = @collection.each_with_index.map { |ef, i| EnterpriseFeePresenter.new(self, ef, i) } } end end diff --git a/app/controllers/admin/enterprises_controller.rb b/app/controllers/admin/enterprises_controller.rb index 6ec6bafce4..01d0a84dc8 100644 --- a/app/controllers/admin/enterprises_controller.rb +++ b/app/controllers/admin/enterprises_controller.rb @@ -195,7 +195,8 @@ module Admin editable_enterprises. order('is_primary_producer ASC, name') elsif json_request? - OpenFoodNetwork::Permissions.new(spree_current_user).editable_enterprises.ransack(params[:q]).result + OpenFoodNetwork::Permissions.new(spree_current_user) + .editable_enterprises.ransack(params[:q]).result else Enterprise.where("1=0") end @@ -203,7 +204,6 @@ module Admin OpenFoodNetwork::Permissions.new(spree_current_user).visible_enterprises .includes(:shipping_methods, :payment_methods).ransack(params[:q]).result else - # TODO was ordered with is_distributor DESC as well, not sure why or how we want to sort this now OpenFoodNetwork::Permissions.new(spree_current_user). editable_enterprises. order('is_primary_producer ASC, name')