github/jumpserver
1
0
Fork 0
mirror of https://github.com/jumpserver/jumpserver.git synced 2025-07-06 19:38:54 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'dev' of github.com:jumpserver/jumpserver into TermLogRecorder

Browse Source
This commit is contained in:
liuzheng712 2016-03-25 21:08:55 +08:00
commit a1862d912a
3 changed files with 7 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
juser/user_api.py
View File

@ -87,12 +87,12 @@ 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') user_get = user[0]
password = kwargs.pop('password')
user.update(**kwargs) user.update(**kwargs)
if pwd != '': if password.strip():
user_get.set_password(pwd) user_get.set_password(password)
user_get.save() user_get.save()
else: else:
return None return None
@ -180,7 +180,7 @@ def server_del_user(username):
delete a user from jumpserver linux system delete a user from jumpserver linux system
删除系统上的某用户 删除系统上的某用户
""" """
bash('userdel -r %s' % username) bash('userdel -r -f %s' % username)
def get_display_msg(user, password='', ssh_key_pwd='', send_mail_need=False): def get_display_msg(user, password='', ssh_key_pwd='', send_mail_need=False):

7
juser/views.py
View File

@ -368,11 +368,6 @@ def user_edit(request):
else: else:
return HttpResponseRedirect(reverse('user_list')) return HttpResponseRedirect(reverse('user_list'))
if password != '':
password_decode = password
else:
password_decode = None
db_update_user(user_id=user_id, db_update_user(user_id=user_id,
password=password, password=password,
name=name, name=name,
@ -391,7 +386,7 @@ def user_edit(request):
密码：%s (如果密码为None代表密码为原密码) 密码：%s (如果密码为None代表密码为原密码)
权限：：%s 权限：：%s
""" % (user.name, URL, user.username, password_decode, user_role.get(role_post, u'')) """ % (user.name, URL, user.username, password, user_role.get(role_post, u''))
send_mail('您的信息已修改', msg, MAIL_FROM, [email], fail_silently=False) send_mail('您的信息已修改', msg, MAIL_FROM, [email], fail_silently=False)
return HttpResponseRedirect(reverse('user_list')) return HttpResponseRedirect(reverse('user_list'))

2
templates/jlog/web_terminal.html
View File

@ -11,7 +11,7 @@
.terminal { .terminal {
border: #000 solid 5px; border: #000 solid 5px;
font-family: "Monaco", "DejaVu Sans Mono", "Liberation Mono", monospace; font-family: "Monaco", "Microsoft Yahei", "DejaVu Sans Mono", "Liberation Mono", monospace;
font-size: 11px; font-size: 11px;
color: #f0f0f0; color: #f0f0f0;
background: #000; background: #000;