From d639801f3c9a9c6cb07c9cd0bbb983dc1313e97d Mon Sep 17 00:00:00 2001
From: guanghongwei <hongwei.guang@yolu-inc.com>
Date: Mon, 29 Sep 2014 18:20:41 +0800
Subject: [PATCH] =?UTF-8?q?=E9=8F=87=E5=AD=98=E6=95=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/webroot/AutoSa/AutoSa/views.py b/webroot/AutoSa/AutoSa/views.py
index f0d984cb5..f381cc466 100644
--- a/webroot/AutoSa/AutoSa/views.py
+++ b/webroot/AutoSa/AutoSa/views.py
@@ -474,11 +474,11 @@ def chgUser(request):
         user = User.objects.get(username=username)
         is_admin = "checked" if user.is_admin else ''
         is_superuser = 'checked' if user.is_superuser else ''
-        groups = user.group.all()
+        all_groups = user.group.all()
 
         return render_to_response('chgUser.html',
                                   {'user': user, 'user_menu': 'active', 'is_admin': is_admin,
-                                   'is_superuser': is_superuser, 'groups': groups},
+                                   'is_superuser': is_superuser, 'groups': all_groups},
                                   context_instance=RequestContext(request))
     else:
         username = request.POST.get('username')
@@ -490,18 +490,24 @@ def chgUser(request):
         is_admin = request.POST.get('is_admin')
         is_superuser = request.POST.get('is_superuser')
         group_post = request.REQUEST.getlist('group')
-
+        groups = []
         user = User.objects.get(username=username)
         is_admin = "checked" if user.is_admin else ''
         is_superuser = 'checked' if user.is_superuser else ''
-        groups = user.group.all()
+        all_groups = Group.objects.all()
 
         keyfile = '%s/keys/%s' % (base_dir, username)
 
+        for group_name in group_post:
+            groups.append(Group.objects.get(name=group_name))
+
         # 如果用户是admin，那么不能委任其他admin或者超级用户
         if is_admin_user(request):
             is_admin = False
             is_superuser = False
+        else:
+            is_admin = True if is_admin else False
+            is_superuser = True if is_superuser else False
 
         if password != password_again or key_pass != key_pass_again:
             error = u'密码不匹配'
@@ -522,7 +528,7 @@ def chgUser(request):
         if error:
             return render_to_response('chgUser.html',
                                       {'user': user, 'user_menu': 'active', 'is_admin': is_admin,
-                                       'is_superuser': is_superuser, 'groups': groups, 'error': error},
+                                       'is_superuser': is_superuser, 'groups': all_groups, 'error': error},
                                       context_instance=RequestContext(request))
 
         u.password = md5_crypt(password)
@@ -536,7 +542,7 @@ def chgUser(request):
         msg = u'修改用户信息成功'
         return render_to_response('chgUser.html',
                                   {'user': user, 'user_menu': 'active', 'is_admin': is_admin,
-                                   'is_superuser': is_superuser, 'groups': groups, 'msg': msg},
+                                   'is_superuser': is_superuser, 'groups': all_groups, 'msg': msg},
                                   context_instance=RequestContext(request))
 
 
diff --git a/webroot/AutoSa/templates/chgUser.html b/webroot/AutoSa/templates/chgUser.html
index eaace8077..2b6fe01bd 100644
--- a/webroot/AutoSa/templates/chgUser.html
+++ b/webroot/AutoSa/templates/chgUser.html
@@ -69,13 +69,13 @@
             <div class="form-group">
                 <label for="is_admin" class="col-sm-2 control-label">组admin</label>
                 <div class="col-sm-4">
-                    <input type="radio" name="is_admin" id="is_admin" value="{{ is_admin }}">
+                    <input type="radio" name="is_admin" id="is_admin" value="1">
                 </div>
             </div>
             <div class="form-group">
                 <label for="is_superuser" class="col-sm-2 control-label">超级admin</label>
                 <div class="col-sm-4">
-                    <input type="radio" name="is_superuser" id="is_superuser" value="{{ is_superuser }}">
+                    <input type="radio" name="is_superuser" id="is_superuser" value="1">
                 </div>
             </div>
             <div class="form-group">