From 222162eaa7455de84bd9beb985c2b76bbc306f77 Mon Sep 17 00:00:00 2001 From: guanghongwei Date: Mon, 29 Sep 2014 16:04:05 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BC=81=D1=85=E7=94=BB=E6=B5=A0=E6=A0=A7?= =?UTF-8?q?=EE=9B=AD=E6=B7=87=EE=86=BD=E6=95=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- webroot/AutoSa/AutoSa/views.py | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/webroot/AutoSa/AutoSa/views.py b/webroot/AutoSa/AutoSa/views.py index b4927e925..636b206df 100644 --- a/webroot/AutoSa/AutoSa/views.py +++ b/webroot/AutoSa/AutoSa/views.py @@ -467,14 +467,13 @@ 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_superuser = 'checked' if user.is_superuser else '' if request.method == "GET": + username = request.GET.get('username') + 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() if not username: return HttpResponseRedirect('/showUser/') @@ -493,7 +492,11 @@ def chgUser(request): is_superuser = request.POST.get('is_superuser') ldap_password = jm.encrypt(keygen(16)) group_post = request.POST.getlist() - 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() keyfile = '%s/keys/%s' % (base_dir, username) @@ -508,10 +511,6 @@ def chgUser(request): if '' in [username, password, key_pass, name, group_post]: error = '带*内容不能为空' - # 组 - for group_name in group_post: - groups.append(Group.objects.get(name=group_name)) - u = User.objects.get(username=username) chg_keypass = bash('ssh-keygen -p -P %s -N %s -f %s' % (jm.decrypt(u.password), password, keyfile))