NeoAnd/netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2026-01-15 00:02:17 -06:00
Code Issues Actions 13 Packages Projects Releases Wiki Activity

Merge branch 'develop' into develop-2.2

Browse Source 
Conflicts:
	netbox/utilities/api.py
This commit is contained in:
Jeremy Stretch
2017-10-11 10:47:21 -04:00
parent f253f164a3 b69bf58c63
commit 007f930fed
6 changed files with 20 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
netbox/templates/ipam/inc/prefix_header.html
View File

@@ -23,7 +23,7 @@
</div>
<div class="pull-right">
{% if perms.ipam.add_ipaddress %}
<a href="{% url 'ipam:ipaddress_add' %}?address={{ prefix.prefix }}{% if prefix.vrf %}&vrf={{ prefix.vrf.pk }}{% endif %}" class="btn btn-success">
<a href="{% url 'ipam:ipaddress_add' %}?address={{ prefix.prefix }}{% if prefix.vrf %}&vrf={{ prefix.vrf.pk }}{% endif %}{% if prefix.tenant %}&tenant={{ prefix.tenant.pk }}{% endif %}" class="btn btn-success">
<span class="fa fa-plus" aria-hidden="true"></span>
Add an IP Address
</a>