From 6c02115f3fb9e02436d40dcbd6b07ca2eeea4f2a Mon Sep 17 00:00:00 2001
From: lizanle <491823689@qq.com>
Date: Wed, 9 Dec 2015 10:17:30 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=8D=E5=85=81=E8=AE=B8=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E7=99=BB=E5=BD=95=E5=90=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/my_controller.rb | 2 +-
 app/views/my/account.html.erb    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/controllers/my_controller.rb b/app/controllers/my_controller.rb
index 16d516f82..f462a64e7 100644
--- a/app/controllers/my_controller.rb
+++ b/app/controllers/my_controller.rb
@@ -118,7 +118,7 @@ class MyController < ApplicationController
         @user.safe_attributes = params[:user]
         @user.pref.attributes = params[:pref]
         @user.pref[:no_self_notified] = (params[:no_self_notified] == '1')
-        @user.login = params[:login]
+        #@user.login = params[:login]
         unless @user.user_extensions.nil?
           if @user.user_extensions.identity == 2
             @user.firstname = params[:enterprise_name]
diff --git a/app/views/my/account.html.erb b/app/views/my/account.html.erb
index be178607f..fa9171496 100644
--- a/app/views/my/account.html.erb
+++ b/app/views/my/account.html.erb
@@ -30,7 +30,7 @@
           <li>&nbsp;&nbsp;</li>
         </ul>
         <ul class="setting_right ">
-          <li><%= f.text_field :login,:no_label=>true, :required => true, :nh_required=>"1", :name => "login",:class=>"w210"%></li>
+          <li><%= f.text_field :login,:no_label=>true, :required => true, :nh_required=>"1",:disabled=>'disabled', :name => "login",:class=>"w210"%></li>
           <li><%= f.text_field :mail,:no_label=>true, :required => true,:nh_required=>"1",:class=>"w210"%></li>
 
           <li>