From 7090281da590f0ae2cd0d936084b12c9dcbd35ca Mon Sep 17 00:00:00 2001 From: stveep Date: Sat, 4 May 2019 21:48:32 +0100 Subject: [PATCH] Reorganise defaces so that display name fields come first --- .../variants/_form/add_display_name.html.haml.deface | 8 -------- ...play_name_unit_value_and_description.html.haml.deface} | 7 +++++++ 2 files changed, 7 insertions(+), 8 deletions(-) delete mode 100644 app/overrides/spree/admin/variants/_form/add_display_name.html.haml.deface rename app/overrides/spree/admin/variants/_form/{add_unit_value_and_description.html.haml.deface => add_display_name_unit_value_and_description.html.haml.deface} (84%) diff --git a/app/overrides/spree/admin/variants/_form/add_display_name.html.haml.deface b/app/overrides/spree/admin/variants/_form/add_display_name.html.haml.deface deleted file mode 100644 index 0ef5aba9ae..0000000000 --- a/app/overrides/spree/admin/variants/_form/add_display_name.html.haml.deface +++ /dev/null @@ -1,8 +0,0 @@ -/ insert_top "[data-hook='variants']" - -.field - = f.label :display_name, t(:display_name) - = f.text_field :display_name, class: "fullwidth" -.field - = f.label :display_as, t(:display_as) - = f.text_field :display_as, class: "fullwidth" diff --git a/app/overrides/spree/admin/variants/_form/add_unit_value_and_description.html.haml.deface b/app/overrides/spree/admin/variants/_form/add_display_name_unit_value_and_description.html.haml.deface similarity index 84% rename from app/overrides/spree/admin/variants/_form/add_unit_value_and_description.html.haml.deface rename to app/overrides/spree/admin/variants/_form/add_display_name_unit_value_and_description.html.haml.deface index fbcc164786..34e1bafe5c 100644 --- a/app/overrides/spree/admin/variants/_form/add_unit_value_and_description.html.haml.deface +++ b/app/overrides/spree/admin/variants/_form/add_display_name_unit_value_and_description.html.haml.deface @@ -1,5 +1,12 @@ / insert_top "[data-hook='admin_variant_form_fields']" +.field + = f.label :display_name, t(:display_name) + = f.text_field :display_name, class: "fullwidth" +.field + = f.label :display_as, t(:display_as) + = f.text_field :display_as, class: "fullwidth" + - if product_has_variant_unit_option_type?(@product) - if @product.variant_unit != 'items' .field{"data-hook" => "unit_value", 'ng-controller' => 'variantUnitsCtrl'}