From a14337df5cf2d61f08874f96ab55ee56a774fa17 Mon Sep 17 00:00:00 2001 From: Hugo Daniel Date: Thu, 20 Sep 2018 12:34:16 +0200 Subject: [PATCH 1/2] Replace Spree::ShippingMethods edit view by our own and apply overrides --- .../edit/add_hubs_sidebar.html.haml.deface | 4 ---- ...ew_shipping_method_buttton.html.haml.deface | 4 ---- .../edit/remove_configuration_sidebar.deface | 1 - .../admin/shipping_methods/edit.html.haml | 18 ++++++++++++++++++ 4 files changed, 18 insertions(+), 9 deletions(-) delete mode 100644 app/overrides/spree/admin/shipping_methods/edit/add_hubs_sidebar.html.haml.deface delete mode 100644 app/overrides/spree/admin/shipping_methods/edit/add_new_shipping_method_buttton.html.haml.deface delete mode 100644 app/overrides/spree/admin/shipping_methods/edit/remove_configuration_sidebar.deface create mode 100644 app/views/spree/admin/shipping_methods/edit.html.haml diff --git a/app/overrides/spree/admin/shipping_methods/edit/add_hubs_sidebar.html.haml.deface b/app/overrides/spree/admin/shipping_methods/edit/add_hubs_sidebar.html.haml.deface deleted file mode 100644 index 057013c5a6..0000000000 --- a/app/overrides/spree/admin/shipping_methods/edit/add_hubs_sidebar.html.haml.deface +++ /dev/null @@ -1,4 +0,0 @@ -/ insert_after "code[erb-loud]:contains(\"render :partial => 'form', :locals => { :f => f }\")" - -.one.column   -= render :partial => 'spree/admin/shared/hubs_sidebar', :locals => { f: f, klass: :shipping_method } \ No newline at end of file diff --git a/app/overrides/spree/admin/shipping_methods/edit/add_new_shipping_method_buttton.html.haml.deface b/app/overrides/spree/admin/shipping_methods/edit/add_new_shipping_method_buttton.html.haml.deface deleted file mode 100644 index b92e713258..0000000000 --- a/app/overrides/spree/admin/shipping_methods/edit/add_new_shipping_method_buttton.html.haml.deface +++ /dev/null @@ -1,4 +0,0 @@ -/ insert_after "code[erb-silent]:contains('content_for :page_actions do')" - -%li - = button_link_to t(:new), spree.new_admin_shipping_method_path, :icon => 'icon-plus' %> \ No newline at end of file diff --git a/app/overrides/spree/admin/shipping_methods/edit/remove_configuration_sidebar.deface b/app/overrides/spree/admin/shipping_methods/edit/remove_configuration_sidebar.deface deleted file mode 100644 index cc3fbcdee1..0000000000 --- a/app/overrides/spree/admin/shipping_methods/edit/remove_configuration_sidebar.deface +++ /dev/null @@ -1 +0,0 @@ -remove "code[erb-loud]:contains(\"render :partial => 'spree/admin/shared/configuration_menu'\")" \ No newline at end of file diff --git a/app/views/spree/admin/shipping_methods/edit.html.haml b/app/views/spree/admin/shipping_methods/edit.html.haml new file mode 100644 index 0000000000..de85d88dcf --- /dev/null +++ b/app/views/spree/admin/shipping_methods/edit.html.haml @@ -0,0 +1,18 @@ +- content_for :page_title do + = Spree.t(:editing_shipping_method) +- content_for :page_actions do + %li + = button_link_to t(:new), spree.new_admin_shipping_method_path, :icon => 'icon-plus' + %li + = button_link_to Spree.t(:back_to_shipping_methods_list), spree.admin_shipping_methods_path, :icon => 'icon-arrow-left' +%div + = render :partial => 'spree/shared/error_messages', :locals => { :target => @shipping_method } +%div + = form_for [:admin, @shipping_method] do |f| + %fieldset.no-border-top + = render :partial => 'form', :locals => { :f => f } + .one.column   + = render :partial => 'spree/admin/shared/hubs_sidebar', :locals => { f: f, klass: :shipping_method } + .clear + %div + = render :partial => 'spree/admin/shared/edit_resource_links' From 07cbb08b4245d0abd447d3b318c475a6459a97b6 Mon Sep 17 00:00:00 2001 From: Hugo Daniel Date: Thu, 20 Sep 2018 14:28:20 +0200 Subject: [PATCH 2/2] Change to new ruby hash syntax --- .../spree/admin/shipping_methods/edit.html.haml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/app/views/spree/admin/shipping_methods/edit.html.haml b/app/views/spree/admin/shipping_methods/edit.html.haml index de85d88dcf..f5c57eb8d0 100644 --- a/app/views/spree/admin/shipping_methods/edit.html.haml +++ b/app/views/spree/admin/shipping_methods/edit.html.haml @@ -2,17 +2,17 @@ = Spree.t(:editing_shipping_method) - content_for :page_actions do %li - = button_link_to t(:new), spree.new_admin_shipping_method_path, :icon => 'icon-plus' + = button_link_to t(:new), spree.new_admin_shipping_method_path, icon: 'icon-plus' %li - = button_link_to Spree.t(:back_to_shipping_methods_list), spree.admin_shipping_methods_path, :icon => 'icon-arrow-left' + = button_link_to Spree.t(:back_to_shipping_methods_list), spree.admin_shipping_methods_path, icon: 'icon-arrow-left' %div - = render :partial => 'spree/shared/error_messages', :locals => { :target => @shipping_method } + = render partial: 'spree/shared/error_messages', locals: { target: @shipping_method } %div = form_for [:admin, @shipping_method] do |f| %fieldset.no-border-top - = render :partial => 'form', :locals => { :f => f } + = render partial: 'form', locals: { f: f } .one.column   - = render :partial => 'spree/admin/shared/hubs_sidebar', :locals => { f: f, klass: :shipping_method } + = render partial: 'spree/admin/shared/hubs_sidebar', locals: { f: f, klass: :shipping_method } .clear %div - = render :partial => 'spree/admin/shared/edit_resource_links' + = render partial: 'spree/admin/shared/edit_resource_links'