From 14a62f5d4978a4d101d82154317ddfc4d45df4de Mon Sep 17 00:00:00 2001 From: Matt-Yorkley <9029026+Matt-Yorkley@users.noreply.github.com> Date: Wed, 5 Jan 2022 17:33:59 +0000 Subject: [PATCH] Change paths helpers to urls --- .../admin/spree/taxons/taxon_tree_menu.js.coffee | 6 +++--- .../javascripts/admin/spree/taxons/taxonomy.js.coffee | 2 +- app/views/spree/admin/shared/_routes.html.erb | 8 ++++---- app/views/spree/admin/taxonomies/edit.haml | 4 ++-- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/app/assets/javascripts/admin/spree/taxons/taxon_tree_menu.js.coffee b/app/assets/javascripts/admin/spree/taxons/taxon_tree_menu.js.coffee index 7fa04871ab..dca01a3aa3 100644 --- a/app/assets/javascripts/admin/spree/taxons/taxon_tree_menu.js.coffee +++ b/app/assets/javascripts/admin/spree/taxons/taxon_tree_menu.js.coffee @@ -2,9 +2,9 @@ root = exports ? this root.taxon_tree_menu = (obj, context) -> - base_url = Spree.url(Spree.routes.taxonomy_taxons_path) - admin_base_url = Spree.url(Spree.routes.admin_taxonomy_taxons_path) - edit_url = Spree.url(Spree.routes.admin_taxonomy_taxons_path + '/' + obj.attr("id") + "/edit"); + base_url = Spree.url(Spree.routes.taxonomy_taxons) + admin_base_url = Spree.url(Spree.routes.admin_taxonomy_taxons) + edit_url = Spree.url(Spree.routes.admin_taxonomy_taxons + '/' + obj.attr("id") + "/edit"); create: label: " " + Spree.translations.add, diff --git a/app/assets/javascripts/admin/spree/taxons/taxonomy.js.coffee b/app/assets/javascripts/admin/spree/taxons/taxonomy.js.coffee index 21f6a8b782..6a8d902caa 100644 --- a/app/assets/javascripts/admin/spree/taxons/taxonomy.js.coffee +++ b/app/assets/javascripts/admin/spree/taxons/taxonomy.js.coffee @@ -70,7 +70,7 @@ root = exports ? this root.setup_taxonomy_tree = (taxonomy_id) -> if taxonomy_id != undefined # this is defined within admin/taxonomies/edit - root.base_url = Spree.url(Spree.routes.taxonomy_taxons_path) + root.base_url = Spree.url(Spree.routes.taxonomy_taxons) $.ajax url: base_url.pathname.replace("/taxons", "/jstree"), diff --git a/app/views/spree/admin/shared/_routes.html.erb b/app/views/spree/admin/shared/_routes.html.erb index 418359b5e7..a0a854781f 100644 --- a/app/views/spree/admin/shared/_routes.html.erb +++ b/app/views/spree/admin/shared/_routes.html.erb @@ -6,9 +6,9 @@ Spree.routes = {} } Spree.routes = <%== { - :variants_search => spree.admin_search_variants_path(:format => 'json'), - :taxons_search => main_app.api_v0_taxons_path(:format => 'json'), - :orders_api => main_app.api_v0_orders_path, - :states_search => main_app.api_v0_states_path(:format => 'json') + :variants_search => spree.admin_search_variants_url(:format => 'json'), + :taxons_search => main_app.api_v0_taxons_url(:format => 'json'), + :orders_api => main_app.api_v0_orders_url, + :states_search => main_app.api_v0_states_url(:format => 'json') }.to_json %>; diff --git a/app/views/spree/admin/taxonomies/edit.haml b/app/views/spree/admin/taxonomies/edit.haml index 1f11fbb56c..4131f2571f 100755 --- a/app/views/spree/admin/taxonomies/edit.haml +++ b/app/views/spree/admin/taxonomies/edit.haml @@ -17,8 +17,8 @@ = label_tag nil, t("spree.tree") %br/ :javascript - Spree.routes.taxonomy_taxons_path = "#{main_app.api_v0_taxonomy_taxons_path(@taxonomy)}"; - Spree.routes.admin_taxonomy_taxons_path = "#{spree.admin_taxonomy_taxons_path(@taxonomy)}"; + Spree.routes.taxonomy_taxons = "#{main_app.api_v0_taxonomy_taxons_url(@taxonomy)}"; + Spree.routes.admin_taxonomy_taxons = "#{spree.admin_taxonomy_taxons_url(@taxonomy)}"; #taxonomy_tree.tree #progress{style: "display:none;"} = image_pack_tag 'select2-spinner.gif', title: 'Spinner', style: "vertical-align:bottom;"