mirror/netbox-community-netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2024-05-10 07:54:54 +00:00
Code Activity

Fixes #2795: Fix duplicate display of pagination controls on child prefix/IP tables

Browse Source
This commit is contained in:
Jeremy Stretch
2019-01-23 13:38:16 -05:00
parent 4227c6b806
commit 22eebbbc71
4 changed files with 3 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -14,6 +14,7 @@ v2.5.4 (FUTURE)
* [#2779](https://github.com/digitalocean/netbox/issues/2779) - Include "none" option when filter IP addresses by role
* [#2783](https://github.com/digitalocean/netbox/issues/2783) - Fix AttributeError exception when attempting to delete region(s)
* [#2795](https://github.com/digitalocean/netbox/issues/2795) - Fix duplicate display of pagination controls on child prefix/IP tables
* [#2798](https://github.com/digitalocean/netbox/issues/2798) - Properly URL-encode "map it" link on site view
---

1
netbox/templates/extras/tag.html
View File

@ -64,6 +64,7 @@
</div>
<div class="col-md-6">
{% include 'panel_table.html' with table=items_table heading='Tagged Objects' %}
{% include 'inc/paginator.html' with paginator=items_table.paginator page=items_table.page %}
</div>
</div>
{% endblock %}

6
netbox/templates/panel_table.html
View File

@ -12,9 +12,3 @@
<div class="panel-body text-muted">None</div>
{% endif %}
</div>
{% if table.rows and not hide_paginator %}
{% with paginator=table.paginator page=table.page %}
{% include 'inc/paginator.html' %}
{% endwith %}
{% endif %}

2
netbox/templates/search.html
View File

@ -12,7 +12,7 @@
<div class="col-md-10">
{% for obj_type in results %}
<h3 id="{{ obj_type.name|lower }}">{{ obj_type.name|bettertitle }}</h3>
{% include 'panel_table.html' with table=obj_type.table hide_paginator=True %}
{% include 'panel_table.html' with table=obj_type.table %}
<a href="{{ obj_type.url }}" class="btn btn-primary pull-right">
<span class="fa fa-arrow-right" aria-hidden="true"></span>
{% if obj_type.table.page.has_next %}