diff --git a/juser/views.py b/juser/views.py index 06ac121a3..f72cd4432 100644 --- a/juser/views.py +++ b/juser/views.py @@ -271,7 +271,7 @@ def send_mail_retry(request): msg = u""" 跳板机地址: %s 用户名:%s - 重设密码:%s/juser/forget_password/ + 重设密码:%s/juser/password/forget/ 请登录web点击个人信息页面重新生成ssh密钥 """ % (URL, user.username, URL) diff --git a/templates/jasset/asset_cu_list.html b/templates/jasset/asset_cu_list.html index cd3c69eb8..24e6144c4 100644 --- a/templates/jasset/asset_cu_list.html +++ b/templates/jasset/asset_cu_list.html @@ -242,7 +242,7 @@ type: 2, title: title, maxmin: true, - area: ['725x', '600px'], + area: ['725px', '600px'], shade: false, content: new_url }); diff --git a/templates/jasset/asset_detail.html b/templates/jasset/asset_detail.html index 48de38e8f..d3d0e8fb8 100644 --- a/templates/jasset/asset_detail.html +++ b/templates/jasset/asset_detail.html @@ -238,7 +238,7 @@ {% for rule in user_rule_perm %}