Browse Source

Default site to that of parent when adding a child prefix

Jeremy Stretch 9 years ago
parent
commit
c803aaf4d4
2 changed files with 3 additions and 3 deletions
  1. 2 2
      netbox/ipam/tables.py
  2. 1 1
      netbox/templates/ipam/prefix.html

+ 2 - 2
netbox/ipam/tables.py

@@ -21,13 +21,13 @@ PREFIX_LINK = """
 {% else %}
 {% else %}
     <span style="padding-left: {{ record.depth }}9px">
     <span style="padding-left: {{ record.depth }}9px">
 {% endif %}
 {% endif %}
-    <a href="{% if record.pk %}{% url 'ipam:prefix' pk=record.pk %}{% else %}{% url 'ipam:prefix_add' %}?prefix={{ record }}{% endif %}">{{ record.prefix }}</a>
+    <a href="{% if record.pk %}{% url 'ipam:prefix' pk=record.pk %}{% else %}{% url 'ipam:prefix_add' %}?prefix={{ record }}{% if site %}&site={{ site.pk }}{% endif %}{% endif %}">{{ record.prefix }}</a>
 </span>
 </span>
 """
 """
 
 
 PREFIX_LINK_BRIEF = """
 PREFIX_LINK_BRIEF = """
 <span style="padding-left: {{ record.depth }}0px">
 <span style="padding-left: {{ record.depth }}0px">
-    <a href="{% if record.pk %}{% url 'ipam:prefix' pk=record.pk %}{% else %}{% url 'ipam:prefix_add' %}?prefix={{ record }}{% endif %}">{{ record.prefix }}</a>
+    <a href="{% if record.pk %}{% url 'ipam:prefix' pk=record.pk %}{% else %}{% url 'ipam:prefix_add' %}?prefix={{ record }}{% if site %}&site={{ site.pk }}{% endif %}{% endif %}">{{ record.prefix }}</a>
 </span>
 </span>
 """
 """
 
 

+ 1 - 1
netbox/templates/ipam/prefix.html

@@ -86,7 +86,7 @@
 </div>
 </div>
 <div class="row">
 <div class="row">
 	<div class="col-md-12">
 	<div class="col-md-12">
-        {% include 'ipam/inc/prefix_table.html' with table=child_prefix_table table_template='panel_table.html' heading='Child Prefixes' %}
+        {% include 'ipam/inc/prefix_table.html' with table=child_prefix_table table_template='panel_table.html' heading='Child Prefixes' site=prefix.site %}
     </div>
     </div>
 </div>
 </div>
 {% endblock %}
 {% endblock %}