From 3e1d561a5ecabc42440454efec045c367d1f9bb6 Mon Sep 17 00:00:00 2001 From: wvengen Date: Sun, 22 Dec 2013 13:28:33 +0100 Subject: [PATCH] fix user form field order and autocompletion --- app/views/admin/users/_form.html.haml | 2 +- app/views/home/profile.html.haml | 2 +- app/views/shared/_user_form_fields.html.haml | 13 ++++++++----- 3 files changed, 10 insertions(+), 7 deletions(-) diff --git a/app/views/admin/users/_form.html.haml b/app/views/admin/users/_form.html.haml index eeb70abf..4fb28547 100644 --- a/app/views/admin/users/_form.html.haml +++ b/app/views/admin/users/_form.html.haml @@ -1,5 +1,5 @@ = simple_form_for([:admin, @user]) do |f| - = render 'shared/user_form_fields', f: f + = render 'shared/user_form_fields', f: f, password_autocomplete: false .form-actions = f.submit = link_to t('ui.or_cancel'), :back diff --git a/app/views/home/profile.html.haml b/app/views/home/profile.html.haml index 0b0364a1..0b164d73 100644 --- a/app/views/home/profile.html.haml +++ b/app/views/home/profile.html.haml @@ -6,7 +6,7 @@ = h(t('.user.title', user: show_user)) %small= t '.user.since', when: distance_of_time_in_words(Time.now, @current_user.created_on) = simple_form_for(@current_user, :url => update_profile_path) do |f| - = render :partial => 'shared/user_form_fields', :locals => {:f => f} + = render :partial => 'shared/user_form_fields', :locals => {:f => f, :password_autocomplete => false} .form-actions = submit_tag t('ui.save'), class: 'btn' .span5 diff --git a/app/views/shared/_user_form_fields.html.haml b/app/views/shared/_user_form_fields.html.haml index 56701874..bb9b9fa1 100644 --- a/app/views/shared/_user_form_fields.html.haml +++ b/app/views/shared/_user_form_fields.html.haml @@ -1,12 +1,15 @@ -- if FoodsoftConfig[:use_nick] - -# use_nil option to user model validators break required mark - = f.input :nick, required: true = f.input :first_name = f.input :last_name = f.input :email +-# need :required because :use_nil option on user model validators break the required mark += f.input :nick, required: true if FoodsoftConfig[:use_nick] +-# you can disable password autocompletion by passing `password_autocomplete: false` to this partial +-# see also https://github.com/foodcoops/foodsoft/wiki/Form-autocompletion +- password_autocomplete = nil unless defined?(:password_autocomplete) +- passwd_opts = (password_autocomplete.nil? ? {} : {autocomplete: password_autocomplete ? 'on' : 'off'}) += f.input :password, :required => f.object.new_record?, input_html: passwd_opts += f.input :password_confirmation, :required => f.object.new_record?, input_html: passwd_opts = f.input :phone -= f.input :password, :required => f.object.new_record? -= f.input :password_confirmation = f.simple_fields_for :settings_attributes do |s| = s.simple_fields_for :profile, defaults: { inline_label: true } do |profile|