From 66f27aad323a4bb95d4bf5f36ed577c8db4baa0c Mon Sep 17 00:00:00 2001 From: Luis Ramos Date: Thu, 3 Sep 2020 22:44:18 +0100 Subject: [PATCH] Explicitly use spree url helpers for spree routes --- app/controllers/admin/enterprises_controller.rb | 2 +- .../spree/admin/general_settings_controller.rb | 2 +- app/controllers/spree/admin/mail_methods_controller.rb | 2 +- app/controllers/spree/admin/orders_controller.rb | 10 +++++----- app/controllers/spree/admin/payments_controller.rb | 4 ++-- app/controllers/spree/admin/products_controller.rb | 8 ++++---- app/controllers/spree/admin/tax_settings_controller.rb | 2 +- app/controllers/spree/admin/taxons_controller.rb | 2 +- 8 files changed, 16 insertions(+), 16 deletions(-) diff --git a/app/controllers/admin/enterprises_controller.rb b/app/controllers/admin/enterprises_controller.rb index 4277dc2ff4..f1b4887f6a 100644 --- a/app/controllers/admin/enterprises_controller.rb +++ b/app/controllers/admin/enterprises_controller.rb @@ -73,7 +73,7 @@ module Admin if @enterprise.update(attributes) flash[:success] = I18n.t(:enterprise_register_success_notice, enterprise: @enterprise.name) - redirect_to admin_dashboard_path + redirect_to spree.admin_dashboard_path else flash[:error] = I18n.t(:enterprise_register_error, enterprise: @enterprise.name) render :welcome, layout: "spree/layouts/bare_admin" diff --git a/app/controllers/spree/admin/general_settings_controller.rb b/app/controllers/spree/admin/general_settings_controller.rb index dcb360bcc9..73fbe619d3 100644 --- a/app/controllers/spree/admin/general_settings_controller.rb +++ b/app/controllers/spree/admin/general_settings_controller.rb @@ -17,7 +17,7 @@ module Spree end flash[:success] = Spree.t(:successfully_updated, resource: Spree.t(:general_settings)) - redirect_to edit_admin_general_settings_path + redirect_to spree.edit_admin_general_settings_path end end end diff --git a/app/controllers/spree/admin/mail_methods_controller.rb b/app/controllers/spree/admin/mail_methods_controller.rb index 70d573f319..d3618488ed 100644 --- a/app/controllers/spree/admin/mail_methods_controller.rb +++ b/app/controllers/spree/admin/mail_methods_controller.rb @@ -23,7 +23,7 @@ module Spree rescue StandardError => e flash[:error] = Spree.t('admin.mail_methods.testmail.error') % { e: e } ensure - redirect_to edit_admin_mail_methods_url + redirect_to spree.edit_admin_mail_methods_url end private diff --git a/app/controllers/spree/admin/orders_controller.rb b/app/controllers/spree/admin/orders_controller.rb index 0e3b28d630..c26ccb769d 100644 --- a/app/controllers/spree/admin/orders_controller.rb +++ b/app/controllers/spree/admin/orders_controller.rb @@ -29,7 +29,7 @@ module Spree @order = Order.create @order.created_by = spree_current_user @order.save - redirect_to edit_admin_order_url(@order) + redirect_to spree.edit_admin_order_url(@order) end def edit @@ -54,10 +54,10 @@ module Spree @order.update! if @order.complete? - redirect_to edit_admin_order_path(@order) + redirect_to spree.edit_admin_order_path(@order) else # Jump to next step if order is not complete - redirect_to admin_order_customer_path(@order) + redirect_to spree.admin_order_customer_path(@order) end end @@ -91,7 +91,7 @@ module Spree Spree::OrderMailer.invoice_email(@order.id, pdf).deliver flash[:success] = t('admin.orders.invoice_email_sent') - respond_with(@order) { |format| format.html { redirect_to edit_admin_order_path(@order) } } + respond_with(@order) { |format| format.html { redirect_to spree.edit_admin_order_path(@order) } } end def print @@ -131,7 +131,7 @@ module Spree flash[:error] = t(:must_have_valid_business_number, enterprise_name: @order.distributor.name) - respond_with(@order) { |format| format.html { redirect_to edit_admin_order_path(@order) } } + respond_with(@order) { |format| format.html { redirect_to spree.edit_admin_order_path(@order) } } end def load_distribution_choices diff --git a/app/controllers/spree/admin/payments_controller.rb b/app/controllers/spree/admin/payments_controller.rb index 22e4e84725..025f3dbef9 100644 --- a/app/controllers/spree/admin/payments_controller.rb +++ b/app/controllers/spree/admin/payments_controller.rb @@ -25,7 +25,7 @@ module Spree begin unless @payment.save - redirect_to admin_order_payments_path(@order) + redirect_to spree.admin_order_payments_path(@order) return end @@ -118,7 +118,7 @@ module Spree return if @order.payment? || @order.complete? flash[:notice] = Spree.t(:fill_in_customer_info) - redirect_to edit_admin_order_customer_url(@order) + redirect_to spree.edit_admin_order_customer_url(@order) end def load_order diff --git a/app/controllers/spree/admin/products_controller.rb b/app/controllers/spree/admin/products_controller.rb index 0556c25a1a..42d4006680 100644 --- a/app/controllers/spree/admin/products_controller.rb +++ b/app/controllers/spree/admin/products_controller.rb @@ -29,9 +29,9 @@ module Spree if @object.save flash[:success] = flash_message_for(@object, :successfully_created) if params[:button] == "add_another" - redirect_to new_admin_product_path + redirect_to spree.new_admin_product_path else - redirect_to admin_products_path + redirect_to spree.admin_products_path end else render :new @@ -70,7 +70,7 @@ module Spree flash[:success] = flash_message_for(@object, :successfully_updated) end - redirect_to edit_admin_product_url(@object, @url_filters) + redirect_to spree.edit_admin_product_url(@object, @url_filters) end end @@ -97,7 +97,7 @@ module Spree Spree.t('notice_messages.product_not_cloned') end - redirect_to edit_admin_product_url(@new) + redirect_to spree.edit_admin_product_url(@new) end def group_buy_options diff --git a/app/controllers/spree/admin/tax_settings_controller.rb b/app/controllers/spree/admin/tax_settings_controller.rb index a66ad219ff..8be30677e0 100644 --- a/app/controllers/spree/admin/tax_settings_controller.rb +++ b/app/controllers/spree/admin/tax_settings_controller.rb @@ -6,7 +6,7 @@ module Spree respond_to do |format| format.html { - redirect_to edit_admin_tax_settings_path + redirect_to spree.edit_admin_tax_settings_path } end end diff --git a/app/controllers/spree/admin/taxons_controller.rb b/app/controllers/spree/admin/taxons_controller.rb index 0b171567d2..a3585ad12f 100644 --- a/app/controllers/spree/admin/taxons_controller.rb +++ b/app/controllers/spree/admin/taxons_controller.rb @@ -95,7 +95,7 @@ module Spree end respond_with(@taxon) do |format| - format.html { redirect_to edit_admin_taxonomy_url(@taxonomy) } + format.html { redirect_to spree.edit_admin_taxonomy_url(@taxonomy) } format.json { render json: @taxon.to_json } end end