fix(jperm) fix jperm role detail list.

* 1. Add a window to list pushed error asset
* 2. Fix old bug for pagninator

jperm/views.py

@@ -4,6 +4,7 @@ from __future__ import unicode_literals
 from django.db.models import Q
 from django.http import HttpResponseBadRequest, HttpResponseNotAllowed
 from paramiko import SSHException
+from collections import OrderedDict
 from jperm.perm_api import *
 
 from juser.models import User, UserGroup
@@ -16,6 +17,7 @@ from jperm.ansible_api import MyTask
 from jperm.perm_api import get_role_info, get_role_push_host
 from jumpserver.api import my_render, get_object, CRYPTOR
 
+
 # 设置PERM APP Log
 from jumpserver.api import logger
 #logger = set_log(LOG_LEVEL, filename='jumpserver_perm.log')
@@ -416,6 +418,7 @@ def perm_role_detail(request):
             users = role_info.get("users")
             user_groups = role_info.get("user_groups")
             pushed_asset, need_push_asset = get_role_push_host(get_object(PermRole, id=role_id))
+
     except ServerError, e:
         logger.warning(e)
 

templates/jperm/perm_role_list.html

@@ -70,7 +70,7 @@
                     <div class="row">
                         <div class="col-sm-6">
                             <div class="dataTables_info" id="editable_info" role="status" aria-live="polite">
-                                Showing {{ users.start_index }} to {{ users.end_index }} of {{ p.count }} entries
+                                Showing {{ roles.start_index }} to {{ roles.end_index }} of {{ p.count }} entries
                             </div>
                         </div>
                         {% include 'paginator.html' %}
@@ -80,8 +80,6 @@
         </div>
     </div>
 </div>
-
-
 <script>
 function remove_role(role_id){
     $.ajax({

templates/jperm/perm_rule_list.html

@@ -89,7 +89,7 @@
                     <div class="row">
                         <div class="col-sm-6">
                             <div class="dataTables_info" id="editable_info" role="status" aria-live="polite">
-                                Showing {{ users.start_index }} to {{ users.end_index }} of {{ p.count }} entries
+                                Showing {{ rules.start_index }} to {{ rules.end_index }} of {{ p.count }} entries
                             </div>
                         </div>
                         {% include 'paginator.html' %}

templates/jperm/perm_sudo_list.html

@@ -72,7 +72,7 @@
                     <div class="row">
                         <div class="col-sm-6">
                             <div class="dataTables_info" id="editable_info" role="status" aria-live="polite">
-                                Showing {{ users.start_index }} to {{ users.end_index }} of {{ p.count }} entries
+                                Showing {{ sudos.start_index }} to {{ sudos.end_index }} of {{ p.count }} entries
                             </div>
                         </div>
                         {% include 'paginator.html' %}