diff options
| author | spag <spag@golwen.net> | 2013-01-24 15:37:24 +0100 |
|---|---|---|
| committer | spag <spag@golwen.net> | 2013-01-24 15:37:24 +0100 |
| commit | 99270421d02b3ac77bf111bbde62a2ef80f8e114 (patch) | |
| tree | 6ddb8328729e53dcc7a605040cd7aece622d0e5a /app/views/users | |
| parent | 5f5ea1d06686ec5cd31cf8b9db177191fa7e66fd (diff) | |
| parent | 2d6ebf19e5cea45dd714f92a64b1b81e1200a811 (diff) | |
Merge branch 'develop' of github.com:amooma/GS5 into develop
Diffstat (limited to 'app/views/users')
| -rw-r--r-- | app/views/users/_form_core.html.haml | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/app/views/users/_form_core.html.haml b/app/views/users/_form_core.html.haml index 24b15f5..980976d 100644 --- a/app/views/users/_form_core.html.haml +++ b/app/views/users/_form_core.html.haml @@ -2,7 +2,8 @@ - if GuiFunction.display?('name_data_fields_in_user_edit_form', current_user) = f.input :male, :collection => [[true, t('users.form.gender.male')], [false, t('users.form.gender.female')]], :label_method => :last, :value_method => :first, :label => t('users.form.male.label'), :hint => conditional_hint('users.form.gender.hint'), :label => t('users.form.gender.label'), :as => :radio_buttons = f.input :first_name, :label => t('users.form.first_name.label'), :hint => conditional_hint('users.form.first_name.hint'), :autofocus => true - = f.input :middle_name, :label => t('users.form.middle_name.label'), :hint => conditional_hint('users.form.middle_name.hint') + - if User.any? + = f.input :middle_name, :label => t('users.form.middle_name.label'), :hint => conditional_hint('users.form.middle_name.hint') = f.input :last_name, :label => t('users.form.last_name.label'), :hint => conditional_hint('users.form.last_name.hint') - if GuiFunction.display?('user_name_field_in_user_edit_form', current_user) = f.input :user_name, :label => t('users.form.user_name.label'), :hint => conditional_hint('users.form.user_name.hint') |