From 1fb2cc4b31cdf281d1e4faa244f75107124bb8ad Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <jstretch@digitalocean.com>
Date: Wed, 11 May 2016 15:28:46 -0400
Subject: [PATCH] Modified RackGroup.__unicode__ to include site name

---
 netbox/dcim/forms.py            | 2 +-
 netbox/dcim/models.py           | 2 +-
 netbox/dcim/tables.py           | 2 +-
 netbox/templates/dcim/rack.html | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/netbox/dcim/forms.py b/netbox/dcim/forms.py
index b667b829e..7c3607774 100644
--- a/netbox/dcim/forms.py
+++ b/netbox/dcim/forms.py
@@ -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):
diff --git a/netbox/dcim/models.py b/netbox/dcim/models.py
index f4b652927..824800b8b 100644
--- a/netbox/dcim/models.py
+++ b/netbox/dcim/models.py
@@ -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)
diff --git a/netbox/dcim/tables.py b/netbox/dcim/tables.py
index dffe3e221..867a006a6 100644
--- a/netbox/dcim/tables.py
+++ b/netbox/dcim/tables.py
@@ -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')
diff --git a/netbox/templates/dcim/rack.html b/netbox/templates/dcim/rack.html
index 33a974a24..3a4abe70e 100644
--- a/netbox/templates/dcim/rack.html
+++ b/netbox/templates/dcim/rack.html
@@ -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 %}