github
/
jumpserver
mirror of https://github.com/jumpserver/jumpserver
1
0
Fork 0
Code Issues Releases Wiki Activity

user.update

pull/26/head
liuzheng712 2015-11-17 11:07:40 +08:00
parent 738c6353ef
commit a99f024dfc
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
juser/user_api.py
View File

@ -87,12 +87,13 @@ def db_update_user(**kwargs):
admin_groups_post = kwargs.pop('admin_groups') admin_groups_post = kwargs.pop('admin_groups')
user_id = kwargs.pop('user_id') user_id = kwargs.pop('user_id')
user = User.objects.filter(id=user_id) user = User.objects.filter(id=user_id)
user_get = User.objects.get(id=user_id)
if user: if user:
pwd = kwargs.pop('password') pwd = kwargs.pop('password')
user.update(**kwargs) user.update(**kwargs)
if pwd != '': if pwd != '':
user.set_password(pwd) user_get.set_password(pwd)
user.save() # user.save()
else: else:
return None return None
@ -101,10 +102,10 @@ def db_update_user(**kwargs):
for group_id in groups_post: for group_id in groups_post:
group = UserGroup.objects.filter(id=group_id) group = UserGroup.objects.filter(id=group_id)
group_select.extend(group) group_select.extend(group)
user.group = group_select user_get.group = group_select
if admin_groups_post != '': if admin_groups_post != '':
user.admingroup_set.all().delete() user_get.admingroup_set.all().delete()
for group_id in admin_groups_post: for group_id in admin_groups_post:
group = get_object(UserGroup, id=group_id) group = get_object(UserGroup, id=group_id)
AdminGroup(user=user, group=group).save() AdminGroup(user=user, group=group).save()