diff --git a/jperm/views.py b/jperm/views.py index 7af646f9f..10e6b3fd7 100644 --- a/jperm/views.py +++ b/jperm/views.py @@ -284,7 +284,7 @@ def perm_role_add(request): try: if get_object(PermRole, name=name): - raise ServerError('已经存在该用户 %s' % name) + raise ServerError(u'已经存在该用户 %s' % name) default = get_object(Setting, name='default') if password: diff --git a/templates/jperm/perm_role_add.html b/templates/jperm/perm_role_add.html index ab2ac43b2..70ad918d8 100644 --- a/templates/jperm/perm_role_add.html +++ b/templates/jperm/perm_role_add.html @@ -93,7 +93,7 @@ $('#roleForm').validator({ theme: "yellow_right_effect", rules: { check_name: [/^\w{2,20}$/, '大小写字母数字和下划线,2-20位'], - check_begin: [/^[\-]+BEGIN RSA PRIVATE KEY[\-]+/gm, '请填写正确的RSA Key'], + check_begin: [/^[\-]+BEGIN RSA PRIVATE KEY[\-]+/gm, 'RSA Key填写有误,请检查'], {# either: function(){#} {# return $('#role_password').val() == ''#} {# }#} @@ -107,8 +107,9 @@ $('#roleForm').validator({ msg: {required: "系统用户名称必填"} }, "role_key": { - rule: "required;check_begin", - tip: "请输入正确格式的RSA私钥" + rule: "check_begin", + ok: "", + empty: true }, {# "role_key": {#} {# rule: "required(either)",#}