From ec4a9e92bffa7583abe356d7075e45c408a52ebf Mon Sep 17 00:00:00 2001
From: guanghongwei <hongwei.guang@yolu-inc.com>
Date: Mon, 29 Sep 2014 15:35:05 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=87=EE=86=BD=E6=95=BCbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 webroot/AutoSa/AutoSa/views.py        | 2 ++
 webroot/AutoSa/templates/chgUser.html | 8 ++++----
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/webroot/AutoSa/AutoSa/views.py b/webroot/AutoSa/AutoSa/views.py
index 7734cf663..c1a2f2080 100644
--- a/webroot/AutoSa/AutoSa/views.py
+++ b/webroot/AutoSa/AutoSa/views.py
@@ -470,6 +470,8 @@ def chgUser(request):
 
     if request.method == "GET":
         username = request.GET.get('username')
+        if not username:
+            return HttpResponseRedirect('/showUser/')
         user = User.objects.get(username=username)
         groups = user.group.all()
         if user.is_admin:
diff --git a/webroot/AutoSa/templates/chgUser.html b/webroot/AutoSa/templates/chgUser.html
index e1a6f8407..7a023d5fb 100644
--- a/webroot/AutoSa/templates/chgUser.html
+++ b/webroot/AutoSa/templates/chgUser.html
@@ -41,25 +41,25 @@
             <div class="form-group">
                 <label for="keypass" class="col-sm-2 control-label">密钥密码<span style="color: red"> *</span></label>
                 <div class="col-sm-4">
-                    <input type="password" id="keypass" name="keypass" class="form-control" value="{{ user.keypass }}" >
+                    <input type="password" id="keypass" name="keypass" class="form-control" value="{{ user.key_pass }}" >
                 </div>
             </div>
             <div class="form-group">
                 <label for="keypass_again" class="col-sm-2 control-label">确认密码<span style="color: red"> *</span></label>
                 <div class="col-sm-4">
-                    <input type="password" id="keypass_again" name="keypass_again" class="form-control" value="{{ user.keypass }}" >
+                    <input type="password" id="keypass_again" name="keypass_again" class="form-control" value="{{ user.key_pass }}" >
                 </div>
             </div>
             <div class="form-group">
                 <label for="name" class="col-sm-2 control-label">姓名<span style="color: red"> *</span></label>
                 <div class="col-sm-4">
-                    <input type="password" id="name" name="name" class="form-control" value="{{ user.name }}" >
+                    <input type="text" id="name" name="name" class="form-control" value="{{ user.name }}" >
                 </div>
             </div>
             <div class="form-group">
                 <label for="group" class="col-sm-2 control-label">属组<span style="color: red"> *</span></label>
                 <div class="col-sm-4">
-                    <select multiple name="group" id="group">
+                    <select multiple name="group" id="group" class="form-control">
                         {% for group in groups %}
                         <option value="{{ group.name }}" >{{ group.name }}</option>
                         {% endfor %}