From c782b46f325d8e872547f4fdb1dc15c9a5e02b4e Mon Sep 17 00:00:00 2001 From: guanghongwei Date: Tue, 27 Jan 2015 17:24:33 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=94=A8=E6=88=B7=E9=80=BB?= =?UTF-8?q?=E8=BE=91=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- juser/views.py | 10 ++++++++++ templates/juser/user_add.html | 4 ++-- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/juser/views.py b/juser/views.py index 0b1077731..04481d089 100644 --- a/juser/views.py +++ b/juser/views.py @@ -121,6 +121,15 @@ def group_db_add(**kwargs): UserGroup.objects.create(**kwargs) +def user_group_add(username, group_name): + user = User.objects.get(username=username) + group = UserGroup.objects.get(name=group_name) + groups = [group] + for g in user.user_group.all(): + groups.append(g) + user.user_group = groups + + def group_add(request): error = '' msg = '' @@ -461,6 +470,7 @@ def user_add(request): server_add_user(username, password, ssh_key_pwd1) group_db_add(name=username, comment=username, type='U') + user_group_add(username=username, group_name=username) if LDAP_ENABLE: ldap_add_user(username, ldap_pwd) msg = u'添加用户 %s 成功！' % username diff --git a/templates/juser/user_add.html b/templates/juser/user_add.html index 5b1390e96..1c11825bb 100644 --- a/templates/juser/user_add.html +++ b/templates/juser/user_add.html @@ -168,13 +168,13 @@ $('#userForm').validator({ msg: {required: "必须填写!"} }, "password": { - rule: "required;length[6~16]", + rule: "required;length[6~50]", tip: "输入密码", ok: "", msg: {required: "必须填写!"} }, "ssh_key_pwd1": { - rule: "required;length[6~16]", + rule: "required;length[6~50]", tip: "ssh私钥密码", ok: "", msg: {required: "必须填写"}