From e8ab3e45f30f5850c80cf35578efc34ad48acd22 Mon Sep 17 00:00:00 2001
From: guanghongwei <hongwei.guang@yolu-inc.com>
Date: Mon, 29 Sep 2014 15:55:32 +0800
Subject: [PATCH] =?UTF-8?q?=E7=81=8F=E8=82=A9=E5=B8=A5=E6=B7=87=EE=86=BD?=
 =?UTF-8?q?=E6=95=BC=E9=8F=82=E5=9B=A6=E6=AC=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 webroot/AutoSa/AutoSa/views.py        | 42 ++++++++++++---------------
 webroot/AutoSa/templates/chgUser.html |  2 --
 2 files changed, 19 insertions(+), 25 deletions(-)

diff --git a/webroot/AutoSa/AutoSa/views.py b/webroot/AutoSa/AutoSa/views.py
index c1a2f2080..793843c27 100644
--- a/webroot/AutoSa/AutoSa/views.py
+++ b/webroot/AutoSa/AutoSa/views.py
@@ -467,38 +467,32 @@ def chgUser(request):
     error = ''
     msg = ''
     jm = PyCrypt(key)
+    username = request.GET.get('username')
+    user = User.objects.get(username=username)
+    groups = user.group.all()
+
+    is_admin = "checked" if user.is_admin else is_admin = ''
+    is_superuser = 'checked' if user.is_superuser else is_admin = ''
 
     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:
-            is_admin = "checked"
-        else:
-            is_admin = ''
-        if user.is_superuser:
-            is_superuser = "checked"
-        else:
-            is_superuser = ''
+
         return render_to_response('chgUser.html',
                                   {'user': user, 'user_menu': 'active', 'is_admin': is_admin,
                                    'is_superuser': is_superuser, 'groups': groups},
                                   context_instance=RequestContext(request))
     else:
-        form = UserAddForm(request.POST)
-        user = form.cleaned_data
         username = request.POST.get('username')
-        password = user['password']
-        password_again = user['password_again']
-        key_pass = user['key_pass']
-        key_pass_again = user['key_pass_again']
-        name = user['name']
-        is_admin = user['is_admin']
-        is_superuser = user['is_superuser']
+        password = request.POST.get('password')
+        password_again = request.POST.get('password_again')
+        key_pass = request.POST.get('key_pass')
+        key_pass_again = request.POST.get('key_pass_again')
+        name = request.POST.get('name')
+        is_admin = request.POST.get('is_admin')
+        is_superuser = request.POST.get('is_superuser')
         ldap_password = jm.encrypt(keygen(16))
-        group_post = user['group']
+        group_post = request.POST.getlist()
         groups = []
 
         keyfile = '%s/keys/%s' % (base_dir, username)
@@ -527,7 +521,8 @@ def chgUser(request):
 
         if error:
             return render_to_response('chgUser.html',
-                                      {'user': user, 'user_menu': 'active', 'form': form, 'error': error},
+                                      {'user': user, 'user_menu': 'active', 'is_admin': is_admin,
+                                       'is_superuser': is_superuser, 'groups': groups, 'error': error},
                                       context_instance=RequestContext(request))
 
         u.password = password
@@ -541,7 +536,8 @@ def chgUser(request):
         u.save()
         msg = '修改用户信息成功'
         return render_to_response('chgUser.html',
-                                  {'user': user, 'user_menu': 'active', 'form': form, 'msg': msg},
+                                  {'user': user, 'user_menu': 'active', 'is_admin': is_admin,
+                                   'is_superuser': is_superuser, 'groups': groups, 'msg': msg},
                                   context_instance=RequestContext(request))
 
 
diff --git a/webroot/AutoSa/templates/chgUser.html b/webroot/AutoSa/templates/chgUser.html
index 7a023d5fb..ec135fc66 100644
--- a/webroot/AutoSa/templates/chgUser.html
+++ b/webroot/AutoSa/templates/chgUser.html
@@ -65,7 +65,6 @@
                         {% endfor %}
                     </select>
                 </div>
-                </div>
             </div>
             <div class="form-group">
                 <label for="is_admin" class="col-sm-2 control-label">组admin</label>
@@ -78,7 +77,6 @@
                 <div class="col-sm-4">
                     <input type="checkbox" name="is_superuser" id="is_superuser" value="{{ is_superuser }}">
                 </div>
-
             </div>
             <div class="form-group">
                 <div class="col-sm-offset-2 col-sm-4">