Closes netbox-community#1406: Display tenant description as title tex…

…t in object lists
huzichunjohn · Sep 25, 2017 · 4a290c5 · 4a290c5
1 parent dbcabe4
commit 4a290c5
Show file tree

Hide file tree

Showing 11 changed files with 76 additions and 8 deletions.
diff --git a/netbox/circuits/tables.py b/netbox/circuits/tables.py
@@ -13,6 +13,14 @@
 {% endif %}
 """
 
+TENANT_LINK = """
+{% if record.tenant %}
+    <a href="{% url 'tenancy:tenant' slug=record.tenant.slug %}" data-toggle="popover" data-trigger="hover" data-container="body" data-html="true" data-content="
+       {{ record.tenant.description }}">{{ record.tenant }}</a>
+{% else %}
+    &mdash;
+{% endif %}
+"""
 
 #
 # Providers
@@ -60,7 +68,7 @@ class CircuitTable(BaseTable):
     pk = ToggleColumn()
     cid = tables.LinkColumn(verbose_name='ID')
     provider = tables.LinkColumn('circuits:provider', args=[Accessor('provider.slug')])
-    tenant = tables.LinkColumn('tenancy:tenant', args=[Accessor('tenant.slug')])
+    tenant = tables.TemplateColumn(TENANT_LINK)
     a_side = tables.LinkColumn(
         'dcim:site', accessor=Accessor('termination_a.site'), orderable=False,
         args=[Accessor('termination_a.site.slug')]

diff --git a/netbox/dcim/tables.py b/netbox/dcim/tables.py
@@ -112,6 +112,14 @@
 {% utilization_graph value %}
 """
 
+TENANT_LINK = """
+{% if record.tenant %}
+    <a href="{% url 'tenancy:tenant' slug=record.tenant.slug %}" data-toggle="popover" data-trigger="hover" data-container="body" data-html="true" data-content="
+       {{ record.tenant.description }}">{{ record.tenant }}</a>
+{% else %}
+    &mdash;
+{% endif %}
+"""
 
 #
 # Regions
@@ -141,7 +149,7 @@ class SiteTable(BaseTable):
     pk = ToggleColumn()
     name = tables.LinkColumn()
     region = tables.TemplateColumn(template_code=SITE_REGION_LINK)
-    tenant = tables.LinkColumn('tenancy:tenant', args=[Accessor('tenant.slug')])
+    tenant = tables.TemplateColumn(TENANT_LINK)
 
     class Meta(BaseTable.Meta):
         model = Site
@@ -207,7 +215,7 @@ class RackTable(BaseTable):
     name = tables.LinkColumn()
     site = tables.LinkColumn('dcim:site', args=[Accessor('site.slug')])
     group = tables.Column(accessor=Accessor('group.name'), verbose_name='Group')
-    tenant = tables.LinkColumn('tenancy:tenant', args=[Accessor('tenant.slug')])
+    tenant = tables.TemplateColumn(TENANT_LINK)
     role = tables.TemplateColumn(RACK_ROLE)
     u_height = tables.TemplateColumn("{{ record.u_height }}U", verbose_name='Height')
 
@@ -398,7 +406,7 @@ class DeviceTable(BaseTable):
     pk = ToggleColumn()
     name = tables.TemplateColumn(template_code=DEVICE_LINK)
     status = tables.TemplateColumn(template_code=DEVICE_STATUS, verbose_name='Status')
-    tenant = tables.LinkColumn('tenancy:tenant', args=[Accessor('tenant.slug')])
+    tenant = tables.TemplateColumn(TENANT_LINK)
     site = tables.LinkColumn('dcim:site', args=[Accessor('site.slug')])
     rack = tables.LinkColumn('dcim:rack', args=[Accessor('rack.pk')])
     device_role = tables.TemplateColumn(DEVICE_ROLE, verbose_name='Role')

diff --git a/netbox/ipam/tables.py b/netbox/ipam/tables.py
@@ -134,9 +134,11 @@
 
 TENANT_LINK = """
 {% if record.tenant %}
-    <a href="{% url 'tenancy:tenant' slug=record.tenant.slug %}">{{ record.tenant }}</a>
+    <a href="{% url 'tenancy:tenant' slug=record.tenant.slug %}" data-toggle="popover" data-trigger="hover" data-container="body" data-html="true" data-content="
+       {{ record.tenant.description }}">{{ record.tenant }}</a>
 {% elif record.vrf.tenant %}
-    <a href="{% url 'tenancy:tenant' slug=record.vrf.tenant.slug %}">{{ record.vrf.tenant }}</a>*
+    <a href="{% url 'tenancy:tenant' slug=record.vrf.tenant.slug %}" data-toggle="popover" data-trigger="hover" data-container="body" data-html="true" data-content="
+       {{ record.vrf.tenant.description }}">{{ record.vrf.tenant }}</a>*
 {% else %}
     &mdash;
 {% endif %}
@@ -151,7 +153,7 @@ class VRFTable(BaseTable):
     pk = ToggleColumn()
     name = tables.LinkColumn()
     rd = tables.Column(verbose_name='RD')
-    tenant = tables.LinkColumn('tenancy:tenant', args=[Accessor('tenant.slug')])
+    tenant = tables.TemplateColumn(TENANT_LINK)
 
     class Meta(BaseTable.Meta):
         model = VRF
@@ -321,7 +323,7 @@ class VLANTable(BaseTable):
     vid = tables.LinkColumn('ipam:vlan', args=[Accessor('pk')], verbose_name='ID')
     site = tables.LinkColumn('dcim:site', args=[Accessor('site.slug')])
     group = tables.Column(accessor=Accessor('group.name'), verbose_name='Group')
-    tenant = tables.LinkColumn('tenancy:tenant', args=[Accessor('tenant.slug')])
+    tenant = tables.TemplateColumn(TENANT_LINK)
     status = tables.TemplateColumn(STATUS_LABEL)
     role = tables.TemplateColumn(VLAN_ROLE_LINK)
 

diff --git a/netbox/templates/circuits/circuit_list.html b/netbox/templates/circuits/circuit_list.html
@@ -25,3 +25,11 @@ <h1>{% block title %}Circuits{% endblock %}</h1>
     </div>
 </div>
 {% endblock %}
+
+{% block javascript %}
+<script type="text/javascript">
+$(function() {
+  $('[data-toggle="popover"]').popover()
+})
+</script>
+{% endblock %}
diff --git a/netbox/templates/dcim/device_list.html b/netbox/templates/dcim/device_list.html
@@ -29,6 +29,7 @@ <h1>{% block title %}Devices{% endblock %}</h1>
 {% block javascript %}
 <script type="text/javascript">
 $(document).ready(function() {
+    $('[data-toggle="popover"]').popover();
 
     var site_list = $('#id_site');
     var rack_group_list = $('#id_rack_group_id');

diff --git a/netbox/templates/dcim/rack_list.html b/netbox/templates/dcim/rack_list.html
@@ -29,6 +29,7 @@ <h1>{% block title %}Racks{% endblock %}</h1>
 {% block javascript %}
 <script type="text/javascript">
 $(document).ready(function() {
+    $('[data-toggle="popover"]').popover();
 
     var site_list = $('#id_site');
     var rack_group_list = $('#id_group_id');

diff --git a/netbox/templates/dcim/site_list.html b/netbox/templates/dcim/site_list.html
@@ -24,3 +24,11 @@ <h1>{% block title %}Sites{% endblock %}</h1>
     </div>
 </div>
 {% endblock %}
+
+{% block javascript %}
+<script type="text/javascript">
+$(function() {
+  $('[data-toggle="popover"]').popover()
+})
+</script>
+{% endblock %}
diff --git a/netbox/templates/ipam/ipaddress_list.html b/netbox/templates/ipam/ipaddress_list.html
@@ -25,3 +25,11 @@ <h1>{% block title %}IP Addresses{% endblock %}</h1>
 	</div>
 </div>
 {% endblock %}
+
+{% block javascript %}
+<script type="text/javascript">
+$(function() {
+  $('[data-toggle="popover"]').popover()
+})
+</script>
+{% endblock %}
diff --git a/netbox/templates/ipam/prefix_list.html b/netbox/templates/ipam/prefix_list.html
@@ -30,3 +30,11 @@ <h1>{% block title %}Prefixes{% endblock %}</h1>
 	</div>
 </div>
 {% endblock %}
+
+{% block javascript %}
+<script type="text/javascript">
+$(function() {
+  $('[data-toggle="popover"]').popover()
+})
+</script>
+{% endblock %}
diff --git a/netbox/templates/ipam/vlan_list.html b/netbox/templates/ipam/vlan_list.html
@@ -26,3 +26,11 @@ <h1>{% block title %}VLANs{% endblock %}</h1>
 	</div>
 </div>
 {% endblock %}
+
+{% block javascript %}
+<script type="text/javascript">
+$(function() {
+  $('[data-toggle="popover"]').popover()
+})
+</script>
+{% endblock %}
diff --git a/netbox/templates/ipam/vrf_list.html b/netbox/templates/ipam/vrf_list.html
@@ -26,3 +26,11 @@ <h1>{% block title %}VRFs{% endblock %}</h1>
 	</div>
 </div>
 {% endblock %}
+
+{% block javascript %}
+<script type="text/javascript">
+$(function() {
+  $('[data-toggle="popover"]').popover()
+})
+</script>
+{% endblock %}