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

Modified RackGroup.__unicode__ to include site name

This commit is contained in:
Jeremy Stretch
2016-05-11 15:28:46 -04:00
parent a0ffd71755
commit 1fb2cc4b31
4 changed files with 4 additions and 4 deletions

View File

@ -175,7 +175,7 @@ def rack_site_choices():
def rack_group_choices():
group_choices = RackGroup.objects.select_related('site').annotate(rack_count=Count('racks'))
return [(g.slug, '{} > {} ({})'.format(g.site.name, g.name, g.rack_count)) for g in group_choices]
return [(g.slug, '{} ({})'.format(g, g.rack_count)) for g in group_choices]
class RackFilterForm(forms.Form, BootstrapMixin):

View File

@ -140,7 +140,7 @@ class RackGroup(models.Model):
]
def __unicode__(self):
return self.name
return '{} - {}'.format(self.site.name, self.name)
def get_absolute_url(self):
return "{}?group={}".format(reverse('dcim:rack_list'), self.slug)

View File

@ -74,7 +74,7 @@ class RackGroupBulkEditTable(RackGroupTable):
class RackTable(tables.Table):
name = tables.LinkColumn('dcim:rack', args=[Accessor('pk')], verbose_name='Name')
site = tables.LinkColumn('dcim:site', args=[Accessor('site.slug')], verbose_name='Site')
group = tables.Column(verbose_name='Group')
group = tables.Column(accessor=Accessor('group.name'), verbose_name='Group')
facility_id = tables.Column(verbose_name='Facility ID')
u_height = tables.Column(verbose_name='Height (U)')
devices = tables.Column(accessor=Accessor('device_count'), orderable=False, verbose_name='Devices')

View File

@ -70,7 +70,7 @@
<td>Group</td>
<td>
{% if rack.group %}
<a href="{% url 'dcim:rack_list' %}?site={{ rack.site.slug }}&group={{ rack.group.slug }}">{{ rack.group }}</a>
<a href="{% url 'dcim:rack_list' %}?site={{ rack.site.slug }}&group={{ rack.group.slug }}">{{ rack.group.name }}</a>
{% else %}
<span class="text-muted">None</span>
{% endif %}