From f3ae7f00a0a2c5d7b7b05223f30af59ef64eeb1f Mon Sep 17 00:00:00 2001
From: guanghongwei <hongwei.guang@yolu-inc.com>
Date: Sat, 14 Mar 2015 23:57:53 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9A=82=E6=97=B6=E8=BF=99=E6=A0=B7=E5=90=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 juser/urls.py                  |  3 +-
 juser/views.py                 | 23 ++++------
 templates/juser/dept_list.html |  2 +-
 templates/juser/user_list.html |  2 +-
 templates/paginator_new..html  | 84 ++++++++++++++++++++++++++++++++++
 5 files changed, 97 insertions(+), 17 deletions(-)
 create mode 100644 templates/paginator_new..html

diff --git a/juser/urls.py b/juser/urls.py
index 1a5f78dc3..81ac8d67e 100644
--- a/juser/urls.py
+++ b/juser/urls.py
@@ -7,7 +7,6 @@ urlpatterns = patterns('juser.views',
     # url(r'^$', 'jumpserver.views.home', name='home'),
     # url(r'^blog/', include('blog.urls')),
 
-
     (r'^dept_list/$', 'dept_list'),
     (r'^dept_add/$', 'dept_add'),
     (r'^dept_del/$', 'dept_del'),
@@ -21,7 +20,7 @@ urlpatterns = patterns('juser.views',
     (r'^group_del_ajax/$', 'group_del_ajax'),
     (r'^group_edit/$', 'group_edit'),
     (r'^user_add/$', 'user_add'),
-    (r'^user_list/(?P<option>\w*)/?$', 'user_list'),
+    (r'^user_list/$', 'user_list'),
     (r'^user_detail/$', 'user_detail'),
     (r'^user_del/$', 'user_del'),
     (r'^user_del_ajax/$', 'user_del_ajax'),
diff --git a/juser/views.py b/juser/views.py
index e3c5a33e2..4ce07861d 100644
--- a/juser/views.py
+++ b/juser/views.py
@@ -527,31 +527,28 @@ def user_add(request):
 
 
 @require_admin
-def user_list(request, option=""):
+def user_list(request):
     user_role = {'SU': u'超级管理员', 'GA': u'组管理员', 'CU': u'普通用户'}
     header_title, path1, path2 = '查看用户', '用户管理', '用户列表'
     keyword = request.GET.get('keyword', '')
     gid = request.GET.get('gid', '')
     did = request.GET.get('did', '')
-    if option == "search":
-        contact_list = User.objects.filter(Q(username__icontains=keyword) | Q(name__icontains=keyword)).order_by('name')
-    elif option == "group":
+    contact_list = User.objects.all().order_by('name')
+
+    if gid:
         user_group = UserGroup.objects.filter(id=gid)
         if user_group:
             user_group = user_group[0]
-            contact_list = user_group.user_set.all().order_by('name')
-        else:
-            contact_list = []
-    elif option == "dept":
+            contact_list = user_group.user_set.all()
+
+    if did:
         dept = DEPT.objects.filter(id=did)
         if dept:
             dept = dept[0]
             contact_list = dept.user_set.all().order_by('name')
-        else:
-            contact_list = []
-    else:
-        print option
-        contact_list = User.objects.all().order_by('name')
+
+    if keyword:
+        contact_list = contact_list.filter(Q(username__icontains=keyword) | Q(name__icontains=keyword)).order_by('name')
 
     contact_list, p, contacts, page_range, current_page, show_first, show_end = pages(contact_list, request)
 
diff --git a/templates/juser/dept_list.html b/templates/juser/dept_list.html
index faa3afeb5..8df3a1728 100644
--- a/templates/juser/dept_list.html
+++ b/templates/juser/dept_list.html
@@ -65,7 +65,7 @@
                                     <input type="checkbox"  name="selected" value="{{ dept.id }}">
                                 </td>
                                 <td class="text-center"> {{ dept.name }} </td>
-                                <td class="text-center"> {{ dept.id | dept_group_num}} </td>
+                                <td class="text-center"> <a href="/juser/">{{ dept.id | dept_group_num}}</a> </td>
                                 <td class="text-center"> {{ dept.id | dept_user_num}} </td>
                                 <td class="text-center"> {{ dept.id | dept_asset_num}} </td>
                                 <td class="text-center"> {{ dept.comment }} </td>
diff --git a/templates/juser/user_list.html b/templates/juser/user_list.html
index 47b8f6e10..1b44755ba 100644
--- a/templates/juser/user_list.html
+++ b/templates/juser/user_list.html
@@ -32,7 +32,7 @@
                     <div class="">
                     <a target="_blank" href="/juser/user_add/" class="btn btn-sm btn-primary "> 添加用户 </a>
                     <a id="del_btn" class="btn btn-sm btn-danger "> 删除所选 </a>
-                    <form id="search_form" method="get" action="./search/" class="pull-right mail-search">
+                    <form id="search_form" method="get" action="" class="pull-right mail-search">
                         <div class="input-group">
                             <input type="text" class="form-control input-sm" id="search_input" name="keyword" placeholder="Search">
                             <div class="input-group-btn">
diff --git a/templates/paginator_new..html b/templates/paginator_new..html
new file mode 100644
index 000000000..6a2bbcaf6
--- /dev/null
+++ b/templates/paginator_new..html
@@ -0,0 +1,84 @@
+<div class="col-sm-6">
+    <div class="dataTables_paginate paging_simple_numbers" id="editable_paginate">
+        <ul class="pagination" style="margin-top: 0; float: right">
+        {% if keyword %}
+            {% if contacts.has_previous %}
+                <li class="paginate_button previous" aria-controls="editable" tabindex="0" >
+                    <a href="?keyword={{ keyword }}&page={{ contacts.previous_page_number }}">Previous</a>
+                </li>
+            {% else %}
+                <li class="paginate_button previous disabled" aria-controls="editable" tabindex="0" >
+                     <a href="#">Previous</a>
+                </li>
+            {% endif %}
+
+            {% set href="" %}
+            {% if gid %}
+                {% set href=href+"&gid="+gid %}
+            {% endif %}
+            {% if did %}
+                {% set href=href+"&did="+did %}
+            {% endif %}
+            {% if keyword %}
+            {% set href=href+"&keyword"+keyword %}
+            {% endif %}
+
+            {% ifequal show_first 1 %}
+                <li class="paginate_button" aria-controls="editable" tabindex="0"><a href="?page=1{{ href }}"  title="第1页">1...</a></li>
+            {% endifequal %}
+            {% for page in page_range %}
+                {% ifequal current_page page %}
+                    <li class="paginate_button active"  aria-controls="editable" tabindex="0"><a href="?page={{ page }}{{ href }}"  title="第{{ page }}页">{{ page }}</a></li>
+                {% else %}
+                    <li class="paginate_button" aria-controls="editable" tabindex="0"><a href="?page={{ page }}{{ href }}"  title="第{{ page }}页">{{ page }}</a></li>
+                {% endifequal %}
+            {% endfor %}
+            {% ifequal show_end 1 %}
+                <li class="paginate_button" aria-controls="editable" tabindex="0"><a href="?page={{ p.num_pages }}{{ href }}"  title="第{{ page }}页">...{{ p.num_pages }}</a></li>
+            {% endifequal %}
+            {% if contacts.has_next %}
+                <li class="paginate_button next" aria-controls="editable" tabindex="0" >
+                    <a href="?page={{ contacts.next_page_number }}{{ href }}">Next</a>
+                </li>
+            {% else %}
+                <li class="paginate_button next disabled" aria-controls="editable" tabindex="0" >
+                    <a href="#">Next</a>
+                </li>
+            {% endif %}
+
+        {% else %}
+            {% if contacts.has_previous %}
+                <li class="paginate_button previous" aria-controls="editable" tabindex="0" >
+                    <a href="?page={{ contacts.previous_page_number }}{{ href }}">Previous</a>
+                </li>
+            {% else %}
+                <li class="paginate_button previous disabled" aria-controls="editable" tabindex="0" >
+                     <a href="#">Previous</a>
+                </li>
+            {% endif %}
+            {% ifequal show_first 1 %}
+                <li class="paginate_button" aria-controls="editable" tabindex="0"><a href="?page=1{{ href }}"  title="第1页">1...</a></li>
+            {% endifequal %}
+            {% for page in page_range %}
+                {% ifequal current_page page %}
+                    <li class="paginate_button active"  aria-controls="editable" tabindex="0"><a href="?page={{ page }}"  title="第{{ page }}页">{{ page }}</a></li>
+                {% else %}
+                    <li class="paginate_button" aria-controls="editable" tabindex="0"><a href="?page={{ page }}"  title="第{{ page }}页">{{ page }}</a></li>
+                {% endifequal %}
+            {% endfor %}
+            {% ifequal show_end 1 %}
+                <li class="paginate_button" aria-controls="editable" tabindex="0"><a href="?page={{ p.num_pages }}"  title="第{{ page }}页">...{{ p.num_pages }}</a></li>
+            {% endifequal %}
+            {% if contacts.has_next %}
+                <li class="paginate_button next" aria-controls="editable" tabindex="0" >
+                    <a href="?page={{ contacts.next_page_number }}">Next</a>
+                </li>
+            {% else %}
+                <li class="paginate_button next disabled" aria-controls="editable" tabindex="0" >
+                    <a href="#">Next</a>
+                </li>
+            {% endif %}
+        {% endif %}
+        </ul>
+    </div>
+</div>