From d90b59191f348072a5af29c2c758fbc585d6d064 Mon Sep 17 00:00:00 2001 From: guanghongwei Date: Mon, 2 Mar 2015 18:27:48 +0800 Subject: [PATCH] =?UTF-8?q?=E9=87=8D=E6=9E=841=20=E9=83=A8=E9=97=A8?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- juser/models.py | 30 ++++---- juser/urls.py | 2 + juser/views.py | 110 +++++++++++++++++---------- static/img/user.png | Bin 0 -> 17315 bytes templates/juser/dept_add.html | 133 +++++++++++++++++++++++++++++++++ templates/juser/dept_list.html | 110 +++++++++++++++++++++++++++ templates/juser/group_add.html | 16 ++-- templates/juser/user_add.html | 22 +----- templates/nav.html | 6 +- 9 files changed, 344 insertions(+), 85 deletions(-) create mode 100644 static/img/user.png create mode 100644 templates/juser/dept_add.html create mode 100644 templates/juser/dept_list.html diff --git a/juser/models.py b/juser/models.py index 67fe6de30..d7efd7a28 100644 --- a/juser/models.py +++ b/juser/models.py @@ -1,15 +1,17 @@ from django.db import models -class UserGroup(models.Model): - GROUP_TYPE_CHOICES = ( - ('P', 'PrivateGroup'), - ('M', 'ManageGroup'), - ('A', 'AuthorizeGroup'), - ) - +class DEPT(models.Model): name = models.CharField(max_length=80, unique=True) - type = models.CharField(max_length=1, choices=GROUP_TYPE_CHOICES, default='P') + comment = models.CharField(max_length=160, blank=True, null=True) + + def __unicode__(self): + return self.name + + +class UserGroup(models.Model): + name = models.CharField(max_length=80, unique=True) + dept = models.ForeignKey(DEPT) comment = models.CharField(max_length=160, blank=True, null=True) def __unicode__(self): @@ -19,21 +21,21 @@ class UserGroup(models.Model): class User(models.Model): USER_ROLE_CHOICES = ( ('SU', 'SuperUser'), - ('GA', 'GroupAdmin'), + ('DA', 'DeptAdmin'), ('CU', 'CommonUser'), ) username = models.CharField(max_length=80, unique=True) password = models.CharField(max_length=100) name = models.CharField(max_length=80) - email = models.EmailField(max_length=75, null=True, blank=True) + email = models.EmailField(max_length=75) role = models.CharField(max_length=2, choices=USER_ROLE_CHOICES, default='CU') - user_group = models.ManyToManyField(UserGroup) + dept = models.ForeignKey(DEPT) + group = models.ManyToManyField(UserGroup) ldap_pwd = models.CharField(max_length=100) ssh_key_pwd = models.CharField(max_length=100) - ssh_pwd = models.CharField(max_length=100) is_active = models.BooleanField(default=True) - last_login = models.IntegerField(default=0) - date_joined = models.IntegerField() + last_login = models.DateTimeField(null=True) + date_joined = models.DateTimeField(null=True) def __unicode__(self): return self.username diff --git a/juser/urls.py b/juser/urls.py index 4d8151027..8067d52bc 100644 --- a/juser/urls.py +++ b/juser/urls.py @@ -11,6 +11,8 @@ urlpatterns = patterns('juser.views', (r'^group_add/$', 'group_add'), (r'^group_add_ajax/$', 'group_add_ajax'), (r'^group_list/$', 'group_list'), + (r'^dept_list/$', 'dept_list'), + (r'^dept_add/$', 'dept_add'), (r'^user_detail/$', 'user_detail'), (r'^user_del/$', 'user_del'), (r'^user_edit/$', 'user_edit'), diff --git a/juser/views.py b/juser/views.py index d57f20428..f284cd7b1 100644 --- a/juser/views.py +++ b/juser/views.py @@ -17,7 +17,7 @@ from django.template import RequestContext from django.http import HttpResponse from django.core.paginator import Paginator, EmptyPage, InvalidPage -from juser.models import UserGroup, User +from juser.models import UserGroup, User, DEPT from connect import PyCrypt, KEY from connect import BASE_DIR from connect import CONF @@ -61,12 +61,12 @@ def gen_sha512(salt, password): return crypt.crypt(password, '$6$%s$' % salt) -def group_db_add(**kwargs): - group_name = kwargs.get('name') - group = UserGroup.objects.filter(name=group_name) +def db_add_group(**kwargs): + name = kwargs.get('name') + group = UserGroup.objects.filter(name=name) if group: - raise AddError('Group %s have been exist .' % group_name) - UserGroup.objects.create(**kwargs) + raise AddError(u'用户组 %s 已经存在' % name) + UserGroup(**kwargs).save() def group_add_user(group_name, user_id=None, username=None): @@ -210,32 +210,75 @@ def ldap_del_user(username): # ldap_conn.add(group_dn, group_attr) +# def group_add_ajax(request): +# group_type = request.POST.get('type', 'A') +# users_all = User.objects.all() +# if group_type == 'A': +# users = users_all +# else: +# users = [user for user in users_all if not user.user_group.filter(type='M')] +# +# return render_to_response('juser/group_add_ajax.html', locals(), context_instance=RequestContext(request)) + + +def dept_add(request): + header_title, path1, path2 = '添加部门', '用户管理', '添加部门' + if request.method == 'POST': + name = request.POST.get('name', '') + comment = request.POST.get('comment', '') + + try: + if not name: + raise AddError('部门名称不能为空') + if DEPT.objects.filter(name=name): + raise AddError(u'部门名称 %s 已存在' % name) + except AddError, e: + error = e + else: + DEPT(name=name, comment=comment).save() + msg = u'添加部门 %s 成功' % name + + return render_to_response('juser/dept_add.html', locals(), context_instance=RequestContext(request)) + + +def dept_list(request): + header_title, path1, path2 = '查看部门', '用户管理', '查看部门' + contact_list = DEPT.objects.all() + p = paginator = Paginator(contact_list, 10) + + try: + current_page = int(request.GET.get('page', '1')) + except ValueError: + current_page = 1 + + page_range = page_list_return(len(p.page_range), current_page) + + try: + contacts = paginator.page(current_page) + except (EmptyPage, InvalidPage): + contacts = paginator.page(paginator.num_pages) + return render_to_response('juser/dept_list.html', locals(), context_instance=RequestContext(request)) + + def group_add(request, group_type_select='A'): error = '' msg = '' - header_title, path1, path2 = '添加属组 | Group Add', '用户管理', '添加用户组' - group_types = { - 'M': '部门', - 'A': '用户组', - } - - users_all = User.objects.all() - if group_type_select == 'M': - users = [user for user in users_all if not user.user_group.filter(type='M')] - else: - users = users_all + header_title, path1, path2 = '添加属组', '用户管理', '添加用户组' + user_all = User.objects.all() + dept_all = DEPT.objects.all() if request.method == 'POST': group_name = request.POST.get('group_name', '') - group_type = request.POST.get('group_type', 'A') + dept_id = request.POST.get('dept_id', '') users_selected = request.POST.getlist('users_selected', '') comment = request.POST.get('comment', '') try: - if not group_name: - error = u'组名不能为空' - raise AddError - group_db_add(name=group_name, comment=comment, type=group_type) + if '' in [group_name, dept_id]: + error = u'组名 或 部门 不能为空' + raise AddError(error) + + group_db_add(name=group_name, comment=comment) for user_id in users_selected: group_add_user(group_name, user_id=user_id) @@ -249,17 +292,6 @@ def group_add(request, group_type_select='A'): return render_to_response('juser/group_add.html', locals(), context_instance=RequestContext(request)) -def group_add_ajax(request): - group_type = request.POST.get('type', 'A') - users_all = User.objects.all() - if group_type == 'A': - users = users_all - else: - users = [user for user in users_all if not user.user_group.filter(type='M')] - - return render_to_response('juser/group_add_ajax.html', locals(), context_instance=RequestContext(request)) - - def group_list(request): header_title, path1, path2 = '查看属组 | Show Group', '用户管理', '查看用户组' groups = contact_list = UserGroup.objects.filter(Q(type='M') | Q(type='A')).order_by('type') @@ -442,21 +474,17 @@ def user_add(request): error = '' msg = '' header_title, path1, path2 = '添加用户 | User Add', '用户管理', '添加用户' - user_role = {'SU': u'超级管理员', 'GA': u'组管理员', 'CU': u'普通用户'} - manage_groups = UserGroup.objects.filter(type='M') - auth_groups = UserGroup.objects.filter(type='A') + user_role = {'SU': u'超级管理员', 'DA': u'部门管理员', 'CU': u'普通用户'} + dept_all = DEPT.objects.all() + if request.method == 'POST': username = request.POST.get('username', None) password = request.POST.get('password', '') name = request.POST.get('name', None) email = request.POST.get('email', '') - manage_group_id = request.POST.get('manage_group') + dept_id = request.POST.get('dept_id') auth_groups = request.POST.getlist('groups', None) - groups = auth_groups - groups.append(manage_group_id) - groups_str = ' '.join(auth_groups) role_post = request.POST.get('role', 'CU') - ssh_pwd = request.POST.get('ssh_pwd', '') ssh_key_pwd = request.POST.get('ssh_key_pwd', '') is_active = request.POST.get('is_active', '1') ldap_pwd = gen_rand_pwd(16) diff --git a/static/img/user.png b/static/img/user.png new file mode 100644 index 0000000000000000000000000000000000000000..2045fc1d75226861cc1923621b52af1e73d424cf GIT binary patch literal 17315 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 +
+
+
+
+
填写基本信息
+
+ + + + + + + + + + +
+
+
+
+ {% if error %} +
{{ error }}
+ {% endif %} + {% if msg %} +
{{ msg }}
+ {% endif %} +
+ +
+ {% if error %} + + {% else %} + + {% endif %} +
+ +
+ +{#
#} +{#
#} +{# #} +{#
#} +{# #} +{#
#} +{#
#} +{#
#} +{# #} +{# #} +{#
#} +{#
#} +{#
#} +{#
#} +{# #} +{#
#} +{#
#} +{#
#} +
+
+ +
+ {% if error %} + + {% else %} + + {% endif %} +
+
+ +
+
+
+ + +
+
+
+
+
+
+
+ + + +{% endblock %} \ No newline at end of file diff --git a/templates/juser/dept_list.html b/templates/juser/dept_list.html new file mode 100644 index 000000000..1f8221f3b --- /dev/null +++ b/templates/juser/dept_list.html @@ -0,0 +1,110 @@ +{% extends 'base.html' %} +{% load mytags %} +{% block content %} +{% include 'nav_cat_bar.html' %} + +
+
+
+
+
+
查看部门
+
+ + + + + + + + + + +
+
+ +
+ + + + + + + + + + + + + {% for dept in contacts.object_list %} + + + + + + + {% endfor %} + +
部门名称成员数量备注操作
{{ dept.name }} {{ dept.name }} {{ dept.comment }} + 成员 + 编辑 + 删除 +
+
+
+
+ Showing {{ contacts.start_index }} to {{ contacts.end_index }} of {{ p.count }} entries +
+
+
+
+
    + {% if contacts.has_previous %} + + {% else %} + + {% endif %} + {% for page in p.page_range %} + {% ifequal offset1 page %} +
  • {{ page }}
    • + {% else %} +
  • {{ page }}
    • + {% endifequal %} + {% endfor %} + {% if contacts.has_next %} + + {% else %} + + {% endif %} +
+
+
+
+
+
+
+
+
+ + + +{% endblock %} \ No newline at end of file diff --git a/templates/juser/group_add.html b/templates/juser/group_add.html index c5d96d522..099e4ac9f 100644 --- a/templates/juser/group_add.html +++ b/templates/juser/group_add.html @@ -7,7 +7,7 @@
-
填写基本信息 Fill group info.
+
填写基本信息
@@ -42,15 +42,11 @@
- +
- + {% for dept in dept_all %} + {% endfor %}
@@ -60,7 +56,7 @@
diff --git a/templates/juser/user_add.html b/templates/juser/user_add.html index ac0523818..0df9238b1 100644 --- a/templates/juser/user_add.html +++ b/templates/juser/user_add.html @@ -9,7 +9,7 @@
-
填写基本信息 Add user info.
+
填写基本信息
@@ -74,12 +74,8 @@
@@ -89,7 +85,7 @@
- - 如果使用password方式，该密码是用户在后端服务器的密码 - -
-
-
diff --git a/templates/nav.html b/templates/nav.html index d1bbe3bac..931dff352 100644 --- a/templates/nav.html +++ b/templates/nav.html @@ -16,8 +16,10 @@