diff --git a/app/controllers/profiles_controller.rb b/app/controllers/profiles_controller.rb index 47cfc5e63f5..9234cd1708f 100644 --- a/app/controllers/profiles_controller.rb +++ b/app/controllers/profiles_controller.rb @@ -13,6 +13,8 @@ class ProfilesController < ApplicationController end def update + params[:user].delete(:email) if @user.ldap_user? + if @user.update_attributes(params[:user]) flash[:notice] = "Profile was successfully updated" else diff --git a/app/views/profiles/show.html.haml b/app/views/profiles/show.html.haml index d382d2d70c4..c22e00d3d77 100644 --- a/app/views/profiles/show.html.haml +++ b/app/views/profiles/show.html.haml @@ -21,16 +21,22 @@ .controls = f.text_field :name, class: "input-xlarge", required: true %span.help-block Enter your name, so people you know can recognize you. + .control-group = f.label :email, class: "control-label" .controls - = f.text_field :email, class: "input-xlarge", required: true - - if @user.unconfirmed_email.present? - %span.help-block - We sent confirmation email to - %strong #{@user.unconfirmed_email} + - if @user.ldap_user? + = f.text_field :email, class: "input-xlarge", required: true, readonly: true + %span.help-block.light + Email is read-only for LDAP user - else - %span.help-block We also use email for avatar detection if no avatar is uploaded. + = f.text_field :email, class: "input-xlarge", required: true + - if @user.unconfirmed_email.present? + %span.help-block + We sent confirmation email to + %strong #{@user.unconfirmed_email} + - else + %span.help-block We also use email for avatar detection if no avatar is uploaded. .control-group = f.label :skype, class: "control-label" .controls= f.text_field :skype, class: "input-xlarge"