Merge branch 'guanghongwei' of gitcafe.com:ibuler/jumpserver into guanghongwei

Conflicts:
	jperm/views.py
	jumpserver/views.py

jperm/urls.py

@@ -9,7 +9,8 @@ urlpatterns = patterns('jperm.views',
     (r'^perm_edit/$', 'perm_edit'),
     (r'^perm_add/$', 'perm_add'),
     (r'^perm_list/$', 'perm_list'),
-    (r'^perm_list_ajax/$', 'perm_list_ajax'),
+    (r'^perm_user_detail/$', 'perm_user_detail'),
+    # (r'^perm_list_ajax/$', 'perm_list_ajax'),
     (r'^perm_detail/$', 'perm_detail'),
     (r'^perm_del/$', 'perm_del'),
     (r'^perm_asset_detail/$', 'perm_asset_detail'),

jperm/views.py

@@ -8,7 +8,7 @@ from jasset.models import Asset, BisGroup
 from jperm.models import Perm, SudoPerm, CmdGroup
 from django.core.paginator import Paginator, EmptyPage, InvalidPage
 from django.db.models import Q
-from jumpserver.views import LDAP_ENABLE, ldap_conn, CONF, perm_user_asset
+from jumpserver.views import LDAP_ENABLE, ldap_conn, CONF, perm_user_asset, page_list_return
 
 
 if LDAP_ENABLE:
@@ -40,19 +40,18 @@ def perm_list(request):
     groups = contact_list = Perm.objects.all()
     users = contact_list2 = User.objects.all().order_by('id')
     p = paginator = Paginator(contact_list, 10)
-    p2 = paginator2 = Paginator(contact_list2, 10)
     try:
-        page = int(request.GET.get('page', '1'))
+        current_page = int(request.GET.get('page', '1'))
     except ValueError:
-        page = 1
+        current_page = 1
+
+    page_range = page_list_return(len(p.page_range), current_page)
 
     try:
-        contacts = paginator.page(page)
-        contacts2 = paginator2.page(page)
+        contacts = paginator.page(current_page)
     except (EmptyPage, InvalidPage):
         contacts = paginator.page(paginator.num_pages)
-        contacts2 = paginator2.page(paginator2.num_pages)
-    return render_to_response('jperm/perm_list.html', locals(), context_instance=RequestContext(request))
+    return render_to_response('jperm/perm_list.html', locals())
 
 
 def user_asset_cmd_groups_get(user_groups_select='', asset_groups_select='', cmd_groups_select=''):

jumpserver/views.py

@@ -52,6 +52,14 @@ class ServerError(Exception):
     pass
 
 
+def page_list_return(total, current=1):
+    min_page = current - 2 if current - 4 > 0 else 1
+    max_page = min_page + 4 if min_page + 4 < total else total
+
+    return range(min_page, max_page+1)
+
+
+
 def jasset_host_edit(j_id, j_ip, j_idc, j_port, j_type, j_group, j_active, j_comment):
     groups = []
     is_active = {u'是': '1', u'否': '2'}

juser/views.py

@@ -21,7 +21,7 @@ from juser.models import UserGroup, User
 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
+from jumpserver.views import md5_crypt, LDAPMgmt, LDAP_ENABLE, ldap_conn, page_list_return
 
 if LDAP_ENABLE:
     LDAP_HOST_URL = CONF.get('ldap', 'host_url')
@@ -266,12 +266,14 @@ def group_list(request):
     p = paginator = Paginator(contact_list, 10)
 
     try:
-        page = int(request.GET.get('page', '1'))
+        current_page = int(request.GET.get('page', '1'))
     except ValueError:
-        page = 1
+        current_page = 1
+
+    page_range = page_list_return(len(p.page_range), current_page)
 
     try:
-        contacts = paginator.page(page)
+        contacts = paginator.page(current_page)
     except (EmptyPage, InvalidPage):
         contacts = paginator.page(paginator.num_pages)
     return render_to_response('juser/group_list.html', locals(), context_instance=RequestContext(request))
@@ -334,12 +336,14 @@ def user_list(request):
     p = paginator = Paginator(contact_list, 10)
 
     try:
-        page = int(request.GET.get('page', '1'))
+        current_page = int(request.GET.get('page', '1'))
     except ValueError:
-        page = 1
+        current_page = 1
+
+    page_range = page_list_return(len(p.page_range), current_page)
 
     try:
-        contacts = paginator.page(page)
+        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))

templates/juser/user_list.html

@@ -89,8 +89,8 @@
                                              <a href="#">Previous</a>
                                         </li>
                                     {% endif %}
-                                    {% for page in p.page_range %}
-                                        {% ifequal offset1 page %}
+                                    {% 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>