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

Fix natural ordering within object tables

Browse Source
This commit is contained in:
Jeremy Stretch
2018-06-11 15:10:31 -04:00
parent 048e843c39
commit 90abeedc3e
3 changed files with 33 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
netbox/dcim/models.py
View File

@@ -77,9 +77,7 @@ class Region(MPTTModel):
#
class SiteManager(NaturalOrderByManager):
def get_queryset(self):
return self.natural_order_by('name')
natural_order_field = 'name'
@python_2_unicode_compatible
@@ -308,9 +306,7 @@ class RackRole(models.Model):
class RackManager(NaturalOrderByManager):
def get_queryset(self):
return self.natural_order_by('site__name', 'name')
natural_order_field = 'name'
@python_2_unicode_compatible
@@ -1098,9 +1094,7 @@ class Platform(models.Model):
class DeviceManager(NaturalOrderByManager):
def get_queryset(self):
return self.natural_order_by('name')
natural_order_field = 'name'
@python_2_unicode_compatible

9
netbox/dcim/tables.py
View File

@@ -175,7 +175,7 @@ class RegionTable(BaseTable):
class SiteTable(BaseTable):
pk = ToggleColumn()
name = tables.LinkColumn()
name = tables.LinkColumn(order_by=('_nat1', '_nat2', '_nat3'))
status = tables.TemplateColumn(template_code=STATUS_LABEL, verbose_name='Status')
region = tables.TemplateColumn(template_code=SITE_REGION_LINK)
tenant = tables.TemplateColumn(template_code=COL_TENANT)
@@ -236,7 +236,7 @@ class RackRoleTable(BaseTable):
class RackTable(BaseTable):
pk = ToggleColumn()
name = tables.LinkColumn()
name = tables.LinkColumn(order_by=('_nat1', '_nat2', '_nat3'))
site = tables.LinkColumn('dcim:site', args=[Accessor('site.slug')])
group = tables.Column(accessor=Accessor('group.name'), verbose_name='Group')
tenant = tables.TemplateColumn(template_code=COL_TENANT)
@@ -469,7 +469,10 @@ class PlatformTable(BaseTable):
class DeviceTable(BaseTable):
pk = ToggleColumn()
name = tables.TemplateColumn(template_code=DEVICE_LINK)
name = tables.TemplateColumn(
order_by=('_nat1', '_nat2', '_nat3'),
template_code=DEVICE_LINK
)
status = tables.TemplateColumn(template_code=STATUS_LABEL, verbose_name='Status')
tenant = tables.TemplateColumn(template_code=COL_TENANT)
site = tables.LinkColumn('dcim:site', args=[Accessor('site.slug')])