Commit 1338d25b authored by ibuler's avatar ibuler

fix bug

parents 9f171da5 f994c4d1
...@@ -518,7 +518,10 @@ class Nav(object): ...@@ -518,7 +518,10 @@ class Nav(object):
@staticmethod @staticmethod
def get_max_asset_property_length(assets, property_='hostname'): def get_max_asset_property_length(assets, property_='hostname'):
try:
return max([len(getattr(asset, property_)) for asset in assets]) return max([len(getattr(asset, property_)) for asset in assets])
except ValueError:
return 30
def print_search_result(self): def print_search_result(self):
hostname_max_length = self.get_max_asset_property_length(self.search_result) hostname_max_length = self.get_max_asset_property_length(self.search_result)
......
...@@ -16,6 +16,7 @@ from jperm.ansible_api import MyTask ...@@ -16,6 +16,7 @@ from jperm.ansible_api import MyTask
from jperm.perm_api import get_role_info, get_role_push_host from jperm.perm_api import get_role_info, get_role_push_host
from jumpserver.api import my_render, get_object, CRYPTOR from jumpserver.api import my_render, get_object, CRYPTOR
# 设置PERM APP Log # 设置PERM APP Log
from jumpserver.api import logger from jumpserver.api import logger
#logger = set_log(LOG_LEVEL, filename='jumpserver_perm.log') #logger = set_log(LOG_LEVEL, filename='jumpserver_perm.log')
...@@ -416,6 +417,7 @@ def perm_role_detail(request): ...@@ -416,6 +417,7 @@ def perm_role_detail(request):
users = role_info.get("users") users = role_info.get("users")
user_groups = role_info.get("user_groups") user_groups = role_info.get("user_groups")
pushed_asset, need_push_asset = get_role_push_host(get_object(PermRole, id=role_id)) pushed_asset, need_push_asset = get_role_push_host(get_object(PermRole, id=role_id))
except ServerError, e: except ServerError, e:
logger.warning(e) logger.warning(e)
......
This diff is collapsed.
...@@ -70,7 +70,7 @@ ...@@ -70,7 +70,7 @@
<div class="row"> <div class="row">
<div class="col-sm-6"> <div class="col-sm-6">
<div class="dataTables_info" id="editable_info" role="status" aria-live="polite"> <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>
</div> </div>
{% include 'paginator.html' %} {% include 'paginator.html' %}
...@@ -80,8 +80,6 @@ ...@@ -80,8 +80,6 @@
</div> </div>
</div> </div>
</div> </div>
<script> <script>
function remove_role(role_id){ function remove_role(role_id){
$.ajax({ $.ajax({
......
...@@ -89,7 +89,7 @@ ...@@ -89,7 +89,7 @@
<div class="row"> <div class="row">
<div class="col-sm-6"> <div class="col-sm-6">
<div class="dataTables_info" id="editable_info" role="status" aria-live="polite"> <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>
</div> </div>
{% include 'paginator.html' %} {% include 'paginator.html' %}
......
...@@ -72,7 +72,7 @@ ...@@ -72,7 +72,7 @@
<div class="row"> <div class="row">
<div class="col-sm-6"> <div class="col-sm-6">
<div class="dataTables_info" id="editable_info" role="status" aria-live="polite"> <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>
</div> </div>
{% include 'paginator.html' %} {% include 'paginator.html' %}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment