Foodsoft/foodsoft
1
1
Fork 0
Code Issues 36 Pull requests 5 Projects 1 Releases Wiki Activity

Merge pull request #332 from foodcoops/feature/edit-address

Browse source 
Allow to edit address from user profile
This commit is contained in:
wvengen 2014-12-23 21:00:20 +01:00
commit 1c0db4374f
4 changed files with 28 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/views/home/profile.html.haml
View file

@ -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, :password_autocomplete => 'store-only'}
= render :partial => 'shared/user_form_fields', :locals => {:f => f, :password_autocomplete => 'store-only', with_address: true}
.form-actions
= submit_tag t('ui.save'), class: 'btn'

9
app/views/shared/_user_form_fields.html.haml
View file

@ -6,12 +6,17 @@
-# You can control password autocompletion by passing `password_autocomplete` to this partial.
-# Possible values: undefined/nil, true, false, 'store-only'
-# see also https://github.com/foodcoops/foodsoft/wiki/Form-autocompletion
- password_autocomplete = nil unless defined?(:password_autocomplete)
- password_html = autocomplete_flag_to_password_html(password_autocomplete)
- password_html = autocomplete_flag_to_password_html(local_assigns[:password_autocomplete])
= f.input :password, :required => f.object.new_record?, input_html: password_html
= f.input :password_confirmation, :required => f.object.new_record?, input_html: password_html
= f.input :phone
- if local_assigns[:with_address] && (f.object.ordergroup || f.object.new_record?)
= f.fields_for [:ordergroup, f.object.ordergroup || Ordergroup.new] do |ogf|
- address_hint = f.object.ordergroup.users.count > 1 ? t('.contact_address_hint') : nil
= ogf.input :contact_address, label: t('activerecord.attributes.ordergroup.contact_address'), required: false,
input_html: { title: address_hint, data: {toggle: 'tooltip', placement: 'right'} }
= f.simple_fields_for :settings_attributes do |s|
= s.simple_fields_for :profile, defaults: { inline_label: true } do |profile|
= profile.input 'language', as: :select, collection: available_locales, required: false, selected: f.object.settings.profile['language']