diff options
| author | Douwe Maan <douwe@gitlab.com> | 2017-09-06 18:34:07 +0300 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2017-09-06 18:34:07 +0300 |
| commit | 58e367fda0ea8301cab912f7b8ed0b79b24f410e (patch) | |
| tree | c6f0641040060c74d5e49706d744a8a0a61c3147 /app/views | |
| parent | cdd8f2f345aeb3fb05bbe8f567e72b717f388636 (diff) | |
| parent | 4df54f260751a832ebf0b8c18524020d6604994b (diff) | |
Merge branch 'generalize-profile-updates' into 'master'
Profile updates from providers
See merge request !12968
Diffstat (limited to 'app/views')
| -rw-r--r-- | app/views/profiles/show.html.haml | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/app/views/profiles/show.html.haml b/app/views/profiles/show.html.haml index aa8d5a8bc1a..35ad280b037 100644 --- a/app/views/profiles/show.html.haml +++ b/app/views/profiles/show.html.haml @@ -45,12 +45,15 @@ Some options are unavailable for LDAP accounts .col-lg-8 .row - = f.text_field :name, required: true, wrapper: { class: 'col-md-9' }, - help: 'Enter your name, so people you know can recognize you.' + - if @user.read_only_attribute?(:name) + = f.text_field :name, required: true, readonly: true, wrapper: { class: 'col-md-9' }, + help: "Your name was automatically set based on your #{ attribute_provider_label(:name) } account, so people you know can recognize you." + - else + = f.text_field :name, required: true, wrapper: { class: 'col-md-9' }, help: "Enter your name, so people you know can recognize you." = f.text_field :id, readonly: true, label: 'User ID', wrapper: { class: 'col-md-3' } - - if @user.external_email? - = f.text_field :email, required: true, readonly: true, help: "Your email address was automatically set based on your #{email_provider_label} account." + - if @user.read_only_attribute?(:email) + = f.text_field :email, required: true, readonly: true, help: "Your email address was automatically set based on your #{ attribute_provider_label(:email) } account." - else = f.text_field :email, required: true, value: (@user.email unless @user.temp_oauth_email?), help: user_email_help_text(@user) @@ -64,7 +67,10 @@ = f.text_field :linkedin = f.text_field :twitter = f.text_field :website_url, label: 'Website' - = f.text_field :location + - if @user.read_only_attribute?(:location) + = f.text_field :location, readonly: true, help: "Your location was automatically set based on your #{ attribute_provider_label(:location) } account." + - else + = f.text_field :location = f.text_field :organization = f.text_area :bio, rows: 4, maxlength: 250, help: 'Tell us about yourself in fewer than 250 characters.' .prepend-top-default.append-bottom-default |