mirror of
https://github.com/netbox-community/netbox.git
synced 2025-12-18 19:32:24 -06:00
Collapsed EditTables into primary table for each object
This commit is contained in:
@@ -9,32 +9,26 @@ from .models import Circuit, Provider
|
||||
#
|
||||
|
||||
class ProviderTable(tables.Table):
|
||||
pk = tables.CheckBoxColumn(visible=False, default='')
|
||||
name = tables.LinkColumn('circuits:provider', args=[Accessor('slug')], verbose_name='Name')
|
||||
asn = tables.Column(verbose_name='ASN')
|
||||
circuit_count = tables.Column(accessor=Accessor('count_circuits'), verbose_name='Circuits')
|
||||
|
||||
class Meta:
|
||||
model = Provider
|
||||
fields = ('name', 'asn', 'circuit_count')
|
||||
fields = ('pk', 'name', 'asn', 'circuit_count')
|
||||
empty_text = "No providers found."
|
||||
attrs = {
|
||||
'class': 'table table-hover',
|
||||
}
|
||||
|
||||
|
||||
class ProviderBulkEditTable(ProviderTable):
|
||||
pk = tables.CheckBoxColumn()
|
||||
|
||||
class Meta(ProviderTable.Meta):
|
||||
model = None # django_tables2 bugfix
|
||||
fields = ('pk', 'name', 'asn', 'circuit_count')
|
||||
|
||||
|
||||
#
|
||||
# Circuits
|
||||
#
|
||||
|
||||
class CircuitTable(tables.Table):
|
||||
pk = tables.CheckBoxColumn(visible=False, default='')
|
||||
cid = tables.LinkColumn('circuits:circuit', args=[Accessor('pk')], verbose_name='ID')
|
||||
type = tables.Column(verbose_name='Type')
|
||||
provider = tables.LinkColumn('circuits:provider', args=[Accessor('provider.slug')], verbose_name='Provider')
|
||||
@@ -44,16 +38,8 @@ class CircuitTable(tables.Table):
|
||||
|
||||
class Meta:
|
||||
model = Circuit
|
||||
fields = ('cid', 'type', 'provider', 'site', 'port_speed', 'commit_rate')
|
||||
fields = ('pk', 'cid', 'type', 'provider', 'site', 'port_speed', 'commit_rate')
|
||||
empty_text = "No circuits found."
|
||||
attrs = {
|
||||
'class': 'table table-hover',
|
||||
}
|
||||
|
||||
|
||||
class CircuitBulkEditTable(CircuitTable):
|
||||
pk = tables.CheckBoxColumn()
|
||||
|
||||
class Meta(CircuitTable.Meta):
|
||||
model = None # django_tables2 bugfix
|
||||
fields = ('pk', 'cid', 'type', 'provider', 'site', 'port_speed', 'commit_rate')
|
||||
|
||||
@@ -10,7 +10,7 @@ from .filters import CircuitFilter
|
||||
from .forms import CircuitForm, CircuitImportForm, CircuitBulkEditForm, CircuitBulkDeleteForm, CircuitFilterForm,\
|
||||
ProviderForm, ProviderImportForm, ProviderBulkEditForm, ProviderBulkDeleteForm
|
||||
from .models import Circuit, Provider
|
||||
from .tables import CircuitTable, CircuitBulkEditTable, ProviderTable, ProviderBulkEditTable
|
||||
from .tables import CircuitTable, ProviderTable
|
||||
|
||||
|
||||
#
|
||||
@@ -20,8 +20,7 @@ from .tables import CircuitTable, CircuitBulkEditTable, ProviderTable, ProviderB
|
||||
class ProviderListView(ObjectListView):
|
||||
queryset = Provider.objects.annotate(count_circuits=Count('circuits'))
|
||||
table = ProviderTable
|
||||
edit_table = ProviderBulkEditTable
|
||||
edit_table_permissions = ['circuits.change_provider', 'circuits.delete_provider']
|
||||
edit_permissions = ['circuits.change_provider', 'circuits.delete_provider']
|
||||
template_name = 'circuits/provider_list.html'
|
||||
|
||||
|
||||
@@ -99,8 +98,7 @@ class CircuitListView(ObjectListView):
|
||||
filter = CircuitFilter
|
||||
filter_form = CircuitFilterForm
|
||||
table = CircuitTable
|
||||
edit_table = CircuitBulkEditTable
|
||||
edit_table_permissions = ['circuits.change_circuit', 'circuits.delete_circuit']
|
||||
edit_permissions = ['circuits.change_circuit', 'circuits.delete_circuit']
|
||||
template_name = 'circuits/circuit_list.html'
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user