From 7531a3ada7528ea2a881c822f39c1d338899cf4c Mon Sep 17 00:00:00 2001 From: ibuler Date: Wed, 18 May 2016 04:08:12 -0500 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=BC=96=E8=BE=91=E7=B3=BB?= =?UTF-8?q?=E7=BB=9F=E7=94=A8=E6=88=B7=EF=BC=8C=E7=94=A8=E6=88=B7=E5=90=8D?= =?UTF-8?q?jsbug=20(#240)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Update perm_role_edit.html --- connect.py | 2 +- templates/jperm/perm_role_edit.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/connect.py b/connect.py index f0f8effd3..5ff7ae268 100755 --- a/connect.py +++ b/connect.py @@ -585,7 +585,7 @@ class Nav(object): print "请输入运行命令所关联系统用户的ID, q退出" try: - role_id = raw_input("\033[1;32mRole>:\033[0m ").strip() + role_id = int(raw_input("\033[1;32mRole>:\033[0m ").strip()) if role_id == 'q': break except (IndexError, ValueError): diff --git a/templates/jperm/perm_role_edit.html b/templates/jperm/perm_role_edit.html index 8ad8ed973..fe10b6c44 100644 --- a/templates/jperm/perm_role_edit.html +++ b/templates/jperm/perm_role_edit.html @@ -94,7 +94,7 @@ $('#roleForm').validator({ timely: 2, theme: "yellow_right_effect", rules: { - check_name: [/(?!^root$)^\w{2,20}$/i, '大小写字母数字和下划线,2-20位,并且非root'], + check_name: [/(?!^root$)^[\w.]{2,20}$/i, '大小写字母数字和下划线小数点,2-20位,并且非root'], check_begin: [/^[\-]+BEGIN RSA PRIVATE KEY[\-]+/gm, 'RSA Key填写有误,请检查'], },