Commit e8ab3e45 authored by guanghongwei's avatar guanghongwei

尼玛修改文件

parent ec4a9e92
...@@ -467,38 +467,32 @@ def chgUser(request): ...@@ -467,38 +467,32 @@ def chgUser(request):
error = '' error = ''
msg = '' msg = ''
jm = PyCrypt(key) 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": if request.method == "GET":
username = request.GET.get('username')
if not username: if not username:
return HttpResponseRedirect('/showUser/') 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', return render_to_response('chgUser.html',
{'user': user, 'user_menu': 'active', 'is_admin': is_admin, {'user': user, 'user_menu': 'active', 'is_admin': is_admin,
'is_superuser': is_superuser, 'groups': groups}, 'is_superuser': is_superuser, 'groups': groups},
context_instance=RequestContext(request)) context_instance=RequestContext(request))
else: else:
form = UserAddForm(request.POST)
user = form.cleaned_data
username = request.POST.get('username') username = request.POST.get('username')
password = user['password'] password = request.POST.get('password')
password_again = user['password_again'] password_again = request.POST.get('password_again')
key_pass = user['key_pass'] key_pass = request.POST.get('key_pass')
key_pass_again = user['key_pass_again'] key_pass_again = request.POST.get('key_pass_again')
name = user['name'] name = request.POST.get('name')
is_admin = user['is_admin'] is_admin = request.POST.get('is_admin')
is_superuser = user['is_superuser'] is_superuser = request.POST.get('is_superuser')
ldap_password = jm.encrypt(keygen(16)) ldap_password = jm.encrypt(keygen(16))
group_post = user['group'] group_post = request.POST.getlist()
groups = [] groups = []
keyfile = '%s/keys/%s' % (base_dir, username) keyfile = '%s/keys/%s' % (base_dir, username)
...@@ -527,7 +521,8 @@ def chgUser(request): ...@@ -527,7 +521,8 @@ def chgUser(request):
if error: if error:
return render_to_response('chgUser.html', 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)) context_instance=RequestContext(request))
u.password = password u.password = password
...@@ -541,7 +536,8 @@ def chgUser(request): ...@@ -541,7 +536,8 @@ def chgUser(request):
u.save() u.save()
msg = '修改用户信息成功' msg = '修改用户信息成功'
return render_to_response('chgUser.html', 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)) context_instance=RequestContext(request))
......
...@@ -65,7 +65,6 @@ ...@@ -65,7 +65,6 @@
{% endfor %} {% endfor %}
</select> </select>
</div> </div>
</div>
</div> </div>
<div class="form-group"> <div class="form-group">
<label for="is_admin" class="col-sm-2 control-label">组admin</label> <label for="is_admin" class="col-sm-2 control-label">组admin</label>
...@@ -78,7 +77,6 @@ ...@@ -78,7 +77,6 @@
<div class="col-sm-4"> <div class="col-sm-4">
<input type="checkbox" name="is_superuser" id="is_superuser" value="{{ is_superuser }}"> <input type="checkbox" name="is_superuser" id="is_superuser" value="{{ is_superuser }}">
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group">
<div class="col-sm-offset-2 col-sm-4"> <div class="col-sm-offset-2 col-sm-4">
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment