From cbf8dac5ccfb1304a87aa72fb7b1881423523eef Mon Sep 17 00:00:00 2001 From: guanghongwei Date: Sat, 7 Mar 2015 18:06:50 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=98=BE=E7=A4=BA=E5=88=86?= =?UTF-8?q?=E9=A1=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- juser/views.py | 39 ++++--------------------------- templates/juser/group_list.html | 39 +------------------------------ templates/juser/user_list.html | 41 ++------------------------------- 3 files changed, 7 insertions(+), 112 deletions(-) diff --git a/juser/views.py b/juser/views.py index 21233bdbc..f616a5604 100644 --- a/juser/views.py +++ b/juser/views.py @@ -22,7 +22,7 @@ from juser.models import UserGroup, User, DEPT from connect import PyCrypt, KEY from connect import BASE_DIR from connect import CONF -from jumpserver.views import md5_crypt, LDAPMgmt, LDAP_ENABLE, ldap_conn, page_list_return +from jumpserver.views import md5_crypt, LDAPMgmt, LDAP_ENABLE, ldap_conn, page_list_return, pages from jumpserver.api import user_perm_group_api if LDAP_ENABLE: @@ -231,19 +231,9 @@ def dept_list(request): contact_list = DEPT.objects.filter(Q(name__icontains=keyword) | Q(comment__icontains=keyword)).order_by('name') else: contact_list = DEPT.objects.filter(id__gt=1) - p = paginator = Paginator(contact_list, 10) - try: - current_page = int(request.GET.get('page', '1')) - except ValueError: - current_page = 1 + contact_list, p, contacts, page_range, current_page, show_first, show_end = pages(contact_list, request) - 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)) @@ -375,19 +365,8 @@ def group_list(request): contact_list = UserGroup.objects.filter(Q(name__icontains=keyword) | Q(comment__icontains=keyword)) else: contact_list = UserGroup.objects.all().order_by('name') - 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) + 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)) @@ -531,19 +510,9 @@ def user_list(request): contact_list = User.objects.filter(Q(username__icontains=keyword) | Q(name__icontains=keyword)).order_by('name') else: contact_list = User.objects.all().order_by('id') - p = paginator = Paginator(contact_list, 10) - try: - current_page = int(request.GET.get('page', '1')) - except ValueError: - current_page = 1 + contact_list, p, contacts, page_range, current_page, show_first, show_end = pages(contact_list, request) - 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/user_list.html', locals(), context_instance=RequestContext(request)) diff --git a/templates/juser/group_list.html b/templates/juser/group_list.html index fd36b9865..0ed29ed00 100644 --- a/templates/juser/group_list.html +++ b/templates/juser/group_list.html @@ -76,44 +76,7 @@ {% endfor %} -
-
-
- Showing {{ contacts.start_index }} to {{ contacts.end_index }} of {{ p.count }} entries -
-
-
-
-
    - {% if contacts.has_previous %} - - {% else %} - - {% endif %} - {% for page in page_range %} - {% ifequal current_page page %} -
  • {{ page }}
    • - {% else %} -
  • {{ page }}
    • - {% endifequal %} - {% endfor %} - {% if contacts.has_next %} - - {% else %} - - {% endif %} -
-
-
-
+ {% include 'paginator.html' %} diff --git a/templates/juser/user_list.html b/templates/juser/user_list.html index a9bd6b3ce..b09f877ec 100644 --- a/templates/juser/user_list.html +++ b/templates/juser/user_list.html @@ -5,7 +5,7 @@
-
+
查看用户
@@ -80,44 +80,7 @@ {% endfor %} -
-
-
- Showing {{ contacts.start_index }} to {{ contacts.end_index }} of {{ p.count }} entries -
-
-
-
-
    - {% if contacts.has_previous %} - - {% else %} - - {% endif %} - {% for page in page_range %} - {% ifequal current_page page %} -
  • {{ page }}
    • - {% else %} -
  • {{ page }}
    • - {% endifequal %} - {% endfor %} - {% if contacts.has_next %} - - {% else %} - - {% endif %} -
-
-
-
+ {% include 'paginator.html' %}