From 60bdde634932cd7e42a1749f6ca62c042dd4d2e2 Mon Sep 17 00:00:00 2001 From: Hugo Daniel Date: Thu, 1 Aug 2019 11:23:44 +0200 Subject: [PATCH] Convert variants/new from erb to haml and import new.js.erb --- app/views/spree/admin/variants/new.html.erb | 9 --------- app/views/spree/admin/variants/new.html.haml | 7 +++++++ app/views/spree/admin/variants/new.js.erb | 3 +++ 3 files changed, 10 insertions(+), 9 deletions(-) delete mode 100644 app/views/spree/admin/variants/new.html.erb create mode 100644 app/views/spree/admin/variants/new.html.haml create mode 100644 app/views/spree/admin/variants/new.js.erb diff --git a/app/views/spree/admin/variants/new.html.erb b/app/views/spree/admin/variants/new.html.erb deleted file mode 100644 index 875fdfa0b1..0000000000 --- a/app/views/spree/admin/variants/new.html.erb +++ /dev/null @@ -1,9 +0,0 @@ -<%= render :partial => 'spree/shared/error_messages', :locals => { :target => @variant } %> - -<%= form_for [:admin, @product, @variant] do |f| %> -
- <%= Spree.t(:new_variant) %> - <%= render :partial => 'form', :locals => { :f => f } %> - <%= render :partial => 'spree/admin/shared/new_resource_links' %> -
-<% end %> diff --git a/app/views/spree/admin/variants/new.html.haml b/app/views/spree/admin/variants/new.html.haml new file mode 100644 index 0000000000..9e9c6827e8 --- /dev/null +++ b/app/views/spree/admin/variants/new.html.haml @@ -0,0 +1,7 @@ += render partial: 'spree/shared/error_messages', locals: { target: @variant } + += form_for [:admin, @product, @variant] do |f| + %fieldset{'data-hook' => "admin_variant_new_form"} + %legend{align: "center"}= Spree.t(:new_variant) + = render partial: 'form', locals: { f: f } + = render partial: 'spree/admin/shared/new_resource_links' diff --git a/app/views/spree/admin/variants/new.js.erb b/app/views/spree/admin/variants/new.js.erb new file mode 100644 index 0000000000..9ddfd69970 --- /dev/null +++ b/app/views/spree/admin/variants/new.js.erb @@ -0,0 +1,3 @@ +$("#new_variant").html('<%= escape_javascript(render template: 'spree/admin/variants/new', formats: [:html], handlers: [:erb]) %>'); +$(".select2").select2(); +$("#new_var_link").hide();