From 9050a52cc2dfad03431e28e1e769fb406c43ceea Mon Sep 17 00:00:00 2001 From: Maikel Linke Date: Thu, 7 Jun 2018 14:35:12 +1000 Subject: [PATCH] Move admin user form override into view --- .../_form/add_enterprise_limit_form_element.html.haml.deface | 5 ----- app/views/spree/admin/users/_form.html.haml | 3 +++ 2 files changed, 3 insertions(+), 5 deletions(-) delete mode 100644 app/overrides/spree/admin/users/_form/add_enterprise_limit_form_element.html.haml.deface diff --git a/app/overrides/spree/admin/users/_form/add_enterprise_limit_form_element.html.haml.deface b/app/overrides/spree/admin/users/_form/add_enterprise_limit_form_element.html.haml.deface deleted file mode 100644 index 0b00900b5c..0000000000 --- a/app/overrides/spree/admin/users/_form/add_enterprise_limit_form_element.html.haml.deface +++ /dev/null @@ -1,5 +0,0 @@ -/ insert_bottom "div[data-hook='admin_user_form_fields'] div.alpha" - -= f.field_container :enterprise_limit do - = f.label :enterprise_limit, t(:enterprise_limit) - = f.text_field :enterprise_limit, :class => 'fullwidth' \ No newline at end of file diff --git a/app/views/spree/admin/users/_form.html.haml b/app/views/spree/admin/users/_form.html.haml index 97e4a5d848..a11624cfa2 100644 --- a/app/views/spree/admin/users/_form.html.haml +++ b/app/views/spree/admin/users/_form.html.haml @@ -12,6 +12,9 @@ = check_box_tag "user[spree_role_ids][]", role.id, @user.spree_roles.include?(role), id: "user_spree_role_#{role.name}" = label_tag role.name = hidden_field_tag "user[spree_role_ids][]", "" + = f.field_container :enterprise_limit do + = f.label :enterprise_limit, t(:enterprise_limit) + = f.text_field :enterprise_limit, class: "fullwidth" .omega.five.columns = f.field_container :password do = f.label :password, Spree.t(:password)