diff --git a/jumpserver/api.py b/jumpserver/api.py index 58e322179..43cdf6aae 100644 --- a/jumpserver/api.py +++ b/jumpserver/api.py @@ -152,35 +152,35 @@ def page_list_return(total, current=1): return range(min_page, max_page+1) -def pages(posts, r): +def pages(post_objects, request): """ page public function , return page's object tuple 分页公用函数，返回分页的对象元组 """ - contact_list = posts - p = paginator = Paginator(contact_list, 10) + paginator = Paginator(post_objects, 10) try: - current_page = int(r.GET.get('page', '1')) + current_page = int(request.GET.get('page', '1')) except ValueError: current_page = 1 - page_range = page_list_return(len(p.page_range), current_page) + page_range = page_list_return(len(paginator.page_range), current_page) try: - contacts = paginator.page(current_page) + page_objects = paginator.page(current_page) except (EmptyPage, InvalidPage): - contacts = paginator.page(paginator.num_pages) + page_objects = paginator.page(paginator.num_pages) if current_page >= 5: show_first = 1 else: show_first = 0 - if current_page <= (len(p.page_range) - 3): + + if current_page <= (len(paginator.page_range) - 3): show_end = 1 else: show_end = 0 - return contact_list, p, contacts, page_range, current_page, show_first, show_end + return post_objects, paginator, page_objects, page_range, current_page, show_first, show_end class Jtty(object): diff --git a/jumpserver/templatetags/mytags.py b/jumpserver/templatetags/mytags.py index ee2f05c13..f5ed765e2 100644 --- a/jumpserver/templatetags/mytags.py +++ b/jumpserver/templatetags/mytags.py @@ -116,10 +116,13 @@ def bool2str(value): # return True # -@register.filter(name='member_count') -def member_count(group_id): - group = UserGroup.objects.get(id=group_id) - return group.user_set.count() +@register.filter(name='members_count') +def members_count(group_id): + group = get_object(UserGroup, id=group_id) + if group: + return group.user_set.count() + else: + return 0 @register.filter(name='group_user_count') diff --git a/juser/models.py b/juser/models.py index 8f95231aa..1e18f6845 100644 --- a/juser/models.py +++ b/juser/models.py @@ -13,6 +13,11 @@ class UserGroup(models.Model): def get_user(self): return self.user_set.all() + def update(self, **kwargs): + for key, value in kwargs.items(): + self.__setattr__(key, value) + self.save() + class User(models.Model): USER_ROLE_CHOICES = ( diff --git a/juser/urls.py b/juser/urls.py index c9bc24d12..5ff976839 100644 --- a/juser/urls.py +++ b/juser/urls.py @@ -8,10 +8,9 @@ urlpatterns = patterns('juser.views', # url(r'^blog/', include('blog.urls')), (r'^group_add/$', group_add), - (r'^group_list/$', view_splitter, {'su': group_list, 'adm': group_list_adm}), - (r'^group_detail/$', 'group_detail'), - (r'^group_del/$', view_splitter, {'su': group_del, 'adm': group_del_adm}), - (r'^group_del_ajax/$', 'group_del_ajax'), + (r'^group_list/$', group_list), + (r'^group_del/$', group_del), + (r'^group_del_ajax', group_del_ajax), (r'^group_edit/$', view_splitter, {'su': group_edit, 'adm': group_edit_adm}), (r'^user_add/$', view_splitter, {'su': user_add, 'adm': user_add_adm}), (r'^user_list/$', view_splitter, {'su': user_list, 'adm': user_list_adm}), diff --git a/juser/user_api.py b/juser/user_api.py index 06f7121e1..84c0f915f 100644 --- a/juser/user_api.py +++ b/juser/user_api.py @@ -35,6 +35,20 @@ def db_add_group(**kwargs): group_add_user(group, user_id) +def group_update_member(group_id, users_id_list): + """ + user group update member + 用户组更新成员 + """ + group = get_object(UserGroup, id=group_id) + if group: + group.user_set.clear() + for user_id in users_id_list: + user = get_object(UserGroup, id=user_id) + if isinstance(user, UserGroup): + group.user_set.add(user) + + def db_add_user(**kwargs): """ add a user in database diff --git a/juser/views.py b/juser/views.py index e26adb5e4..575f56530 100644 --- a/juser/views.py +++ b/juser/views.py @@ -24,6 +24,10 @@ def chg_role(request): @require_role(role='super') def group_add(request): + """ + group add view for route + 添加用户组的视图 + """ error = '' msg = '' header_title, path1, path2 = '添加用户组', '用户管理', '添加用户组' @@ -55,51 +59,27 @@ def group_add(request): @require_role(role='super') def group_list(request): - header_title, path1, path2 = '查看小组', '用户管理', '查看小组' + """ + list user group + 用户组列表 + """ + header_title, path1, path2 = '查看用户组', '用户管理', '查看用户组' keyword = request.GET.get('search', '') - did = request.GET.get('did', '') - contact_list = UserGroup.objects.all().order_by('name') - - if did: - dept = DEPT.objects.filter(id=did) - if dept: - dept = dept[0] - contact_list = dept.usergroup_set.all() + user_group_list = UserGroup.objects.all().order_by('name') if keyword: - contact_list = contact_list.filter(Q(name__icontains=keyword) | Q(comment__icontains=keyword)) + user_group_list = user_group_list.filter(Q(name__icontains=keyword) | Q(comment__icontains=keyword)) - contact_list, p, contacts, page_range, current_page, show_first, show_end = pages(contact_list, request) + contacts, p, contacts, page_range, current_page, show_first, show_end = pages(user_group_list, request) return render_to_response('juser/group_list.html', locals(), context_instance=RequestContext(request)) -@require_role(role='admin') -def group_list_adm(request): - header_title, path1, path2 = '查看部门小组', '用户管理', '查看小组' - keyword = request.GET.get('search', '') - did = request.GET.get('did', '') - user, dept = get_session_user_dept(request) - contact_list = dept.usergroup_set.all().order_by('name') - - if keyword: - contact_list = contact_list.filter(Q(name__icontains=keyword) | Q(comment__icontains=keyword)) - - contact_list, p, contacts, page_range, current_page, show_first, show_end = pages(contact_list, request) - return render_to_response('juser/group_list.html', locals(), context_instance=RequestContext(request)) - - -@require_role(role='admin') -def group_detail(request): - group_id = request.GET.get('id', None) - if not group_id: - return HttpResponseRedirect('/') - group = UserGroup.objects.get(id=group_id) - users = group.user_set.all() - return render_to_response('juser/group_detail.html', locals(), context_instance=RequestContext(request)) - - @require_role(role='super') def group_del(request): + """ + del a group + 删除用户组 + """ group_id = request.GET.get('id', '') if not group_id: return HttpResponseRedirect('/') @@ -107,59 +87,56 @@ def group_del(request): return HttpResponseRedirect('/juser/group_list/') -@require_role(role='admin') -def group_del_adm(request): - group_id = request.GET.get('id', '') - if not validate(request, user_group=[group_id]): - return HttpResponseRedirect('/juser/group_list/') - if not group_id: - return HttpResponseRedirect('/') - UserGroup.objects.filter(id=group_id).delete() - return HttpResponseRedirect('/juser/group_list/') - - -@require_role(role='admin') +@require_role(role='super') def group_del_ajax(request): group_ids = request.POST.get('group_ids') group_ids = group_ids.split(',') - if request.session.get('role_id') == 1: - if not validate(request, user_group=group_ids): - return "error" for group_id in group_ids: UserGroup.objects.filter(id=group_id).delete() return HttpResponse('删除成功') +# @require_role(role='admin') +# def group_list_adm(request): +# header_title, path1, path2 = '查看部门小组', '用户管理', '查看小组' +# keyword = request.GET.get('search', '') +# did = request.GET.get('did', '') +# user, dept = get_session_user_dept(request) +# contact_list = dept.usergroup_set.all().order_by('name') +# +# if keyword: +# contact_list = contact_list.filter(Q(name__icontains=keyword) | Q(comment__icontains=keyword)) +# +# contact_list, p, contacts, page_range, current_page, show_first, show_end = pages(contact_list, request) +# return render_to_response('juser/group_list.html', locals(), context_instance=RequestContext(request)) -def group_update_member(group_id, users_id_list): - group = UserGroup.objects.filter(id=group_id) - if group: - group = group[0] - group.user_set.clear() - for user_id in users_id_list: - user = User.objects.get(id=user_id) - group.user_set.add(user) +# +# @require_role(role='admin') +# def group_detail(request): +# group_id = request.GET.get('id', None) +# if not group_id: +# return HttpResponseRedirect('/') +# group = UserGroup.objects.get(id=group_id) +# users = group.user_set.all() +# return render_to_response('juser/group_detail.html', locals(), context_instance=RequestContext(request)) @require_role(role='super') def group_edit(request): error = '' msg = '' - header_title, path1, path2 = '修改小组信息', '用户管理', '编辑小组' + header_title, path1, path2 = '编辑用户组', '用户管理', '编辑用户组' + if request.method == 'GET': group_id = request.GET.get('id', '') - group = UserGroup.objects.filter(id=group_id) - if group: - group = group[0] - dept_all = DEPT.objects.all() + user_group = get_object(UserGroup, id=group_id) + if user_group: users_all = User.objects.all() - users_selected = group.user_set.all() - users = [user for user in users_all if user not in users_selected] + users_selected = user_group.user_set.all() + users_remain = [user for user in users_all if user not in users_selected] - return render_to_response('juser/group_edit.html', locals(), context_instance=RequestContext(request)) else: group_id = request.POST.get('group_id', '') group_name = request.POST.get('group_name', '') - dept_id = request.POST.get('dept_id', '') comment = request.POST.get('comment', '') users_selected = request.POST.getlist('users_selected') @@ -167,25 +144,31 @@ def group_edit(request): try: if '' in [group_id, group_name]: raise ServerError('组名不能为空') - dept = DEPT.objects.filter(id=dept_id) - if dept: - dept = dept[0] - else: - raise ServerError('部门不存在') + + user_group = get_object(UserGroup, id=group_id) + other_group = get_object(UserGroup, name=group_name) + + if other_group and other_group.id != int(group_id): + raise ServerError(u'%s 用户组已存在' % group_name) + for user_id in users_selected: users.extend(User.objects.filter(id=user_id)) - user_group = UserGroup.objects.filter(id=group_id) if user_group: - user_group.update(name=group_name, comment=comment, dept=dept) - user_group = user_group[0] + user_group.update(name=group_name, comment=comment) user_group.user_set.clear() user_group.user_set = users except ServerError, e: error = e + if not error: + return HttpResponseRedirect('/juser/group_list/') + else: + users_all = User.objects.all() + users_selected = user_group.user_set.all() + users_remain = [user for user in users_all if user not in users_selected] - return HttpResponseRedirect('/juser/group_list/') + return render_to_response('juser/group_edit.html', locals(), context_instance=RequestContext(request)) @require_role(role='admin') diff --git a/templates/footer.html b/templates/footer.html index 00305471b..969e5cfe6 100644 --- a/templates/footer.html +++ b/templates/footer.html @@ -3,6 +3,6 @@ Version 2.0.0 GPL.
- Copyright Jumpserver.org Organization © 2014-2015 + Copyright Jumpserver.org Team © 2014-2015
diff --git a/templates/juser/group_add.html b/templates/juser/group_add.html index e2f1c61ce..3201a91d0 100644 --- a/templates/juser/group_add.html +++ b/templates/juser/group_add.html @@ -20,6 +20,7 @@ +
{% if error %} @@ -106,23 +107,6 @@ $('#groupForm').validator({ } }); -function change_type(type){ - $.post('/juser/group_add_ajax/', - {'type': type}, - function(data){ - $('#users').html(data) - }) -} - - -function change_dept(dept_id){ - $.get('/juser/dept_user_ajax/', - {'id': dept_id}, - function(data){ - $('#users').html(data) - }) -} - $(document).ready(function(){ $("#submit_button").click(function(){ diff --git a/templates/juser/group_add_ajax.html b/templates/juser/group_add_ajax.html deleted file mode 100644 index e842df809..000000000 --- a/templates/juser/group_add_ajax.html +++ /dev/null @@ -1,4 +0,0 @@ -{% for user in users %} - -{% endfor %} - diff --git a/templates/juser/group_edit.html b/templates/juser/group_edit.html index bd31d7abb..02a550013 100644 --- a/templates/juser/group_edit.html +++ b/templates/juser/group_edit.html @@ -4,7 +4,7 @@ {% include 'nav_cat_bar.html' %}
-
+
填写基本信息
@@ -15,12 +15,6 @@ - @@ -35,35 +29,19 @@
{{ msg }}
{% endif %}
- +
- - + +
- {% ifequal session_role_id 2 %} +
- -
- -
-
- {% endifequal %} -
-
- +
@@ -88,7 +66,7 @@
- +
@@ -105,7 +83,9 @@
+{% endblock %} +{% block self_footer_js %} {% endblock %} \ No newline at end of file diff --git a/templates/juser/group_list.html b/templates/juser/group_list.html index 0da320d67..6958e47b6 100644 --- a/templates/juser/group_list.html +++ b/templates/juser/group_list.html @@ -7,8 +7,9 @@
+
-
查看小组
+
查看用户组
@@ -16,12 +17,6 @@ - @@ -30,14 +25,14 @@
- 添加小组 - 删除所选 + 添加用户组 + 删除所选组
@@ -51,7 +46,6 @@ 组名 - 所属部门 成员数目 备注 操作 @@ -64,8 +58,7 @@ {{ group.name }} - {{ group.dept.name }} - {{ group.id | member_count }} + {{ group.id | members_count }} {{ group.comment }} 编辑 @@ -88,25 +81,28 @@
+{% endblock %} +{% block self_footer_js %} - {% endblock %} \ No newline at end of file