From fbc3078c07d277ca30d24bf2f51544f588e10040 Mon Sep 17 00:00:00 2001 From: ibuler Date: Thu, 24 Mar 2016 18:04:04 +0800 Subject: [PATCH 1/3] =?UTF-8?q?fix(userdel)=20=E4=BF=AE=E5=A4=8D=E6=97=A0?= =?UTF-8?q?=E6=B3=95=E5=88=A0=E9=99=A4=E5=9C=A8=E7=BA=BF=E7=94=A8=E6=88=B7?= =?UTF-8?q?bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 当用户已经登录到jumpserver时，web上删除用户时失败，也没有提示 修改方法: userdel -r -f 强制删除 close #156 --- juser/user_api.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/juser/user_api.py b/juser/user_api.py index 335dd2d96..020a009fd 100644 --- a/juser/user_api.py +++ b/juser/user_api.py @@ -180,7 +180,7 @@ def server_del_user(username): 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): From b745ebdda1deef4d9bd24cb5807a5d796a9190a2 Mon Sep 17 00:00:00 2001 From: ibuler Date: Thu, 24 Mar 2016 19:03:20 +0800 Subject: [PATCH 2/3] =?UTF-8?q?fix(web=20terminal)=20Windows=20=E6=B5=8F?= =?UTF-8?q?=E8=A7=88=E5=99=A8=E4=BD=BF=E7=94=A8chrome=20-=E6=8D=A2?= =?UTF-8?q?=E8=A1=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 经测试由于字体原因，可以安装Monaco字体解决，然而不太方便 添加第二字体为 微软雅黑，经测试解决 fixed close #158 --- templates/jlog/web_terminal.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/jlog/web_terminal.html b/templates/jlog/web_terminal.html index deb9fb4c9..86b50bc99 100644 --- a/templates/jlog/web_terminal.html +++ b/templates/jlog/web_terminal.html @@ -11,7 +11,7 @@ .terminal { 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; color: #f0f0f0; background: #000; From 69061791edf9e4d1bc5601040ed4350ce50c3576 Mon Sep 17 00:00:00 2001 From: ibuler Date: Fri, 25 Mar 2016 17:18:41 +0800 Subject: [PATCH 3/3] =?UTF-8?q?fix(user=20edit)=20=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E7=94=A8=E6=88=B7=E5=AF=BC=E8=87=B4=E5=AF=86=E7=A0=81=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 简单修改，更改结构和变量名 close #160 --- juser/user_api.py | 8 ++++---- juser/views.py | 7 +------ 2 files changed, 5 insertions(+), 10 deletions(-) diff --git a/juser/user_api.py b/juser/user_api.py index 020a009fd..f2964eade 100644 --- a/juser/user_api.py +++ b/juser/user_api.py @@ -87,12 +87,12 @@ def db_update_user(**kwargs): admin_groups_post = kwargs.pop('admin_groups') user_id = kwargs.pop('user_id') user = User.objects.filter(id=user_id) - user_get = User.objects.get(id=user_id) if user: - pwd = kwargs.pop('password') + user_get = user[0] + password = kwargs.pop('password') user.update(**kwargs) - if pwd != '': - user_get.set_password(pwd) + if password.strip(): + user_get.set_password(password) user_get.save() else: return None diff --git a/juser/views.py b/juser/views.py index a1a514def..90c3d2f53 100644 --- a/juser/views.py +++ b/juser/views.py @@ -368,11 +368,6 @@ def user_edit(request): else: return HttpResponseRedirect(reverse('user_list')) - if password != '': - password_decode = password - else: - password_decode = None - db_update_user(user_id=user_id, password=password, name=name, @@ -391,7 +386,7 @@ def user_edit(request): 密码：%s (如果密码为None代表密码为原密码) 权限：：%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) return HttpResponseRedirect(reverse('user_list'))