NeoAnd/netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2025-08-07 16:18:16 -06:00
Code Issues Actions 19 Packages Projects Releases Wiki Activity

Merge 4a290c51b4 into ce9f1eb201

Browse Source
This commit is contained in:
huzichunjohn 2017-09-25 07:47:26 +00:00 committed by GitHub
commit 289f870408
11 changed files with 76 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
netbox/circuits/tables.py
View File

@ -13,6 +13,14 @@ CIRCUITTYPE_ACTIONS = """
{% 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')]

14
netbox/dcim/tables.py
View File

@ -112,6 +112,14 @@ UTILIZATION_GRAPH = """
{% 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')

10
netbox/ipam/tables.py
View File

@ -134,9 +134,11 @@ VLANGROUP_ACTIONS = """
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)

8
netbox/templates/circuits/circuit_list.html
View File

@ -25,3 +25,11 @@
</div>
</div>
{% endblock %}
{% block javascript %}
<script type="text/javascript">
$(function() {
$('[data-toggle="popover"]').popover()
})
</script>
{% endblock %}

1
netbox/templates/dcim/device_list.html
View File

@ -29,6 +29,7 @@
{% 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');

1
netbox/templates/dcim/rack_list.html
View File

@ -29,6 +29,7 @@
{% 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');

8
netbox/templates/dcim/site_list.html
View File

@ -24,3 +24,11 @@
</div>
</div>
{% endblock %}
{% block javascript %}
<script type="text/javascript">
$(function() {
$('[data-toggle="popover"]').popover()
})
</script>
{% endblock %}

8
netbox/templates/ipam/ipaddress_list.html
View File

@ -25,3 +25,11 @@
</div>
</div>
{% endblock %}
{% block javascript %}
<script type="text/javascript">
$(function() {
$('[data-toggle="popover"]').popover()
})
</script>
{% endblock %}

8
netbox/templates/ipam/prefix_list.html
View File

@ -30,3 +30,11 @@
</div>
</div>
{% endblock %}
{% block javascript %}
<script type="text/javascript">
$(function() {
$('[data-toggle="popover"]').popover()
})
</script>
{% endblock %}

8
netbox/templates/ipam/vlan_list.html
View File

@ -26,3 +26,11 @@
</div>
</div>
{% endblock %}
{% block javascript %}
<script type="text/javascript">
$(function() {
$('[data-toggle="popover"]').popover()
})
</script>
{% endblock %}

8
netbox/templates/ipam/vrf_list.html
View File

@ -26,3 +26,11 @@
</div>
</div>
{% endblock %}
{% block javascript %}
<script type="text/javascript">
$(function() {
$('[data-toggle="popover"]').popover()
})
</script>
{% endblock %}