github
/
jumpserver
mirror of https://github.com/jumpserver/jumpserver
1
0
Fork 0
Code Issues Releases Wiki Activity

fix bug in pagination_range function (#511) 

start and end may be float when current_num >= 3 and display % 2 == 1
pull/508/merge
Fengxu Lin 2017-07-10 10:39:18 +08:00 committed by 老广
parent 4e67749eef
commit 26a169d938
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
apps/common/templatetags/common_tags.py
View File

@ -30,8 +30,13 @@ def pagination_range(total_page, current_num=1, display=5):
except ValueError:
current_num = 1
start = current_num - display/2 if current_num > display/2 else 1
end = start + display if start + display <= total_page else total_page + 1
half_display = int(display/2)
start = current_num - half_display if current_num > half_display else 1
if start + display <= total_page:
end = start + display
else:
end = total_page + 1
start = end - display if end > display else 1
return range(start, end)
@ -68,4 +73,4 @@ def to_html(s):
@register.filter
def proxy_log_commands(log_id):
return command_store.filter(proxy_log_id=log_id)
return command_store.filter(proxy_log_id=log_id)