Closes #6001: Paginate component tables under device views

This commit is contained in:
Jeremy Stretch 2021-03-31 14:24:05 -04:00
parent 9a5f54bdaf
commit 04fc3a5a9e
11 changed files with 19 additions and 0 deletions

View File

@ -101,6 +101,7 @@ A new Cloud model has been introduced to represent the boundary of a network tha
* [#5971](https://github.com/netbox-community/netbox/issues/5971) - Add dedicated views for organizational models * [#5971](https://github.com/netbox-community/netbox/issues/5971) - Add dedicated views for organizational models
* [#5972](https://github.com/netbox-community/netbox/issues/5972) - Enable bulk editing for organizational models * [#5972](https://github.com/netbox-community/netbox/issues/5972) - Enable bulk editing for organizational models
* [#5975](https://github.com/netbox-community/netbox/issues/5975) - Allow partial (decimal) vCPU allocations for virtual machines * [#5975](https://github.com/netbox-community/netbox/issues/5975) - Allow partial (decimal) vCPU allocations for virtual machines
* [#6001](https://github.com/netbox-community/netbox/issues/6001) - Paginate component tables under device views
* [#6038](https://github.com/netbox-community/netbox/issues/6038) - Include tagged objects list on tag view * [#6038](https://github.com/netbox-community/netbox/issues/6038) - Include tagged objects list on tag view
### Other Changes ### Other Changes

View File

@ -1268,6 +1268,7 @@ class DeviceConsolePortsView(generic.ObjectView):
) )
if request.user.has_perm('dcim.change_consoleport') or request.user.has_perm('dcim.delete_consoleport'): if request.user.has_perm('dcim.change_consoleport') or request.user.has_perm('dcim.delete_consoleport'):
consoleport_table.columns.show('pk') consoleport_table.columns.show('pk')
paginate_table(consoleport_table, request)
return { return {
'consoleport_table': consoleport_table, 'consoleport_table': consoleport_table,
@ -1293,6 +1294,7 @@ class DeviceConsoleServerPortsView(generic.ObjectView):
if request.user.has_perm('dcim.change_consoleserverport') or \ if request.user.has_perm('dcim.change_consoleserverport') or \
request.user.has_perm('dcim.delete_consoleserverport'): request.user.has_perm('dcim.delete_consoleserverport'):
consoleserverport_table.columns.show('pk') consoleserverport_table.columns.show('pk')
paginate_table(consoleserverport_table, request)
return { return {
'consoleserverport_table': consoleserverport_table, 'consoleserverport_table': consoleserverport_table,
@ -1315,6 +1317,7 @@ class DevicePowerPortsView(generic.ObjectView):
) )
if request.user.has_perm('dcim.change_powerport') or request.user.has_perm('dcim.delete_powerport'): if request.user.has_perm('dcim.change_powerport') or request.user.has_perm('dcim.delete_powerport'):
powerport_table.columns.show('pk') powerport_table.columns.show('pk')
paginate_table(powerport_table, request)
return { return {
'powerport_table': powerport_table, 'powerport_table': powerport_table,
@ -1337,6 +1340,7 @@ class DevicePowerOutletsView(generic.ObjectView):
) )
if request.user.has_perm('dcim.change_poweroutlet') or request.user.has_perm('dcim.delete_poweroutlet'): if request.user.has_perm('dcim.change_poweroutlet') or request.user.has_perm('dcim.delete_poweroutlet'):
poweroutlet_table.columns.show('pk') poweroutlet_table.columns.show('pk')
paginate_table(poweroutlet_table, request)
return { return {
'poweroutlet_table': poweroutlet_table, 'poweroutlet_table': poweroutlet_table,
@ -1361,6 +1365,7 @@ class DeviceInterfacesView(generic.ObjectView):
) )
if request.user.has_perm('dcim.change_interface') or request.user.has_perm('dcim.delete_interface'): if request.user.has_perm('dcim.change_interface') or request.user.has_perm('dcim.delete_interface'):
interface_table.columns.show('pk') interface_table.columns.show('pk')
paginate_table(interface_table, request)
return { return {
'interface_table': interface_table, 'interface_table': interface_table,
@ -1383,6 +1388,7 @@ class DeviceFrontPortsView(generic.ObjectView):
) )
if request.user.has_perm('dcim.change_frontport') or request.user.has_perm('dcim.delete_frontport'): if request.user.has_perm('dcim.change_frontport') or request.user.has_perm('dcim.delete_frontport'):
frontport_table.columns.show('pk') frontport_table.columns.show('pk')
paginate_table(frontport_table, request)
return { return {
'frontport_table': frontport_table, 'frontport_table': frontport_table,
@ -1403,6 +1409,7 @@ class DeviceRearPortsView(generic.ObjectView):
) )
if request.user.has_perm('dcim.change_rearport') or request.user.has_perm('dcim.delete_rearport'): if request.user.has_perm('dcim.change_rearport') or request.user.has_perm('dcim.delete_rearport'):
rearport_table.columns.show('pk') rearport_table.columns.show('pk')
paginate_table(rearport_table, request)
return { return {
'rearport_table': rearport_table, 'rearport_table': rearport_table,
@ -1425,6 +1432,7 @@ class DeviceDeviceBaysView(generic.ObjectView):
) )
if request.user.has_perm('dcim.change_devicebay') or request.user.has_perm('dcim.delete_devicebay'): if request.user.has_perm('dcim.change_devicebay') or request.user.has_perm('dcim.delete_devicebay'):
devicebay_table.columns.show('pk') devicebay_table.columns.show('pk')
paginate_table(devicebay_table, request)
return { return {
'devicebay_table': devicebay_table, 'devicebay_table': devicebay_table,
@ -1447,6 +1455,7 @@ class DeviceInventoryView(generic.ObjectView):
) )
if request.user.has_perm('dcim.change_inventoryitem') or request.user.has_perm('dcim.delete_inventoryitem'): if request.user.has_perm('dcim.change_inventoryitem') or request.user.has_perm('dcim.delete_inventoryitem'):
inventoryitem_table.columns.show('pk') inventoryitem_table.columns.show('pk')
paginate_table(inventoryitem_table, request)
return { return {
'inventoryitem_table': inventoryitem_table, 'inventoryitem_table': inventoryitem_table,

View File

@ -44,6 +44,7 @@
</div> </div>
</div> </div>
</form> </form>
{% include 'inc/paginator.html' with paginator=consoleport_table.paginator page=consoleport_table.page %}
{% table_config_form consoleport_table %} {% table_config_form consoleport_table %}
{% endblock %} {% endblock %}

View File

@ -44,6 +44,7 @@
</div> </div>
</div> </div>
</form> </form>
{% include 'inc/paginator.html' with paginator=consoleserverport_table.paginator page=consoleserverport_table.page %}
{% table_config_form consoleserverport_table %} {% table_config_form consoleserverport_table %}
{% endblock %} {% endblock %}

View File

@ -41,6 +41,7 @@
</div> </div>
</div> </div>
</form> </form>
{% include 'inc/paginator.html' with paginator=devicebay_table.paginator page=devicebay_table.page %}
{% table_config_form devicebay_table %} {% table_config_form devicebay_table %}
{% endblock %} {% endblock %}

View File

@ -44,6 +44,7 @@
</div> </div>
</div> </div>
</form> </form>
{% include 'inc/paginator.html' with paginator=frontport_table.paginator page=frontport_table.page %}
{% table_config_form frontport_table %} {% table_config_form frontport_table %}
{% endblock %} {% endblock %}

View File

@ -47,6 +47,7 @@
</div> </div>
</div> </div>
</form> </form>
{% include 'inc/paginator.html' with paginator=interface_table.paginator page=interface_table.page %}
{% table_config_form interface_table %} {% table_config_form interface_table %}
{% endblock %} {% endblock %}

View File

@ -41,6 +41,7 @@
</div> </div>
</div> </div>
</form> </form>
{% include 'inc/paginator.html' with paginator=inventoryitem_table.paginator page=inventoryitem_table.page %}
{% table_config_form inventoryitem_table %} {% table_config_form inventoryitem_table %}
{% endblock %} {% endblock %}

View File

@ -44,6 +44,7 @@
</div> </div>
</div> </div>
</form> </form>
{% include 'inc/paginator.html' with paginator=poweroutlet_table.paginator page=poweroutlet_table.page %}
{% table_config_form poweroutlet_table %} {% table_config_form poweroutlet_table %}
{% endblock %} {% endblock %}

View File

@ -44,6 +44,7 @@
</div> </div>
</div> </div>
</form> </form>
{% include 'inc/paginator.html' with paginator=powerport_table.paginator page=powerport_table.page %}
{% table_config_form powerport_table %} {% table_config_form powerport_table %}
{% endblock %} {% endblock %}

View File

@ -44,6 +44,7 @@
</div> </div>
</div> </div>
</form> </form>
{% include 'inc/paginator.html' with paginator=rearport_table.paginator page=rearport_table.page %}
{% table_config_form rearport_table %} {% table_config_form rearport_table %}
{% endblock %} {% endblock %}