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

Fixed login, new_password and invitation views.

Browse source
This commit is contained in:
benni 2012-10-08 11:51:56 +02:00
parent f20ae890dd
commit 1708df3f6c
18 changed files with 200 additions and 122 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -3,11 +3,12 @@
= f.input :last_name
= f.input :email
= f.input :phone
= f.input :password, :required => @user.new_record?
= f.input :password, :required => f.object.new_record?
= f.input :password_confirmation
- for setting in User::setting_keys.keys
.input.boolean
= check_box_tag "user[setting_attributes][#{setting}]",
'1', @user.settings[setting] == '1' || @user.settings_default(setting),
:class => 'boolean'
%label.boolean{:for => "user[setting_attributes][#{setting}]"}= h User::setting_keys[setting]
.control-group
.controls
- for setting in User::setting_keys.keys
%label.checkbox{:for => "user[setting_attributes][#{setting}]"}
= check_box_tag "user[setting_attributes][#{setting}]", '1',
f.object.settings[setting] == '1' || f.object.settings_default(setting)
= User::setting_keys[setting]