From 458251683cbfbf7de3047d4219a2e9392cc04a2f Mon Sep 17 00:00:00 2001
From: Daniel Sheppard <dans@dansheps.com>
Date: Wed, 25 Sep 2019 09:28:23 -0500
Subject: [PATCH] Fixes: #3540 - Changed interface edit to use new inline vlan
edit fields
---
.../virtualization/interface_edit.html | 30 ++-----------------
1 file changed, 3 insertions(+), 27 deletions(-)
diff --git a/netbox/templates/virtualization/interface_edit.html b/netbox/templates/virtualization/interface_edit.html
index 7977f9fed..437b960c9 100644
--- a/netbox/templates/virtualization/interface_edit.html
+++ b/netbox/templates/virtualization/interface_edit.html
@@ -11,20 +11,11 @@
{% render_field form.mtu %}
{% render_field form.description %}
{% render_field form.mode %}
+ {% render_field form.untagged_vlan %}
+ {% render_field form.tagged_vlans %}
{% render_field form.tags %}
</div>
</div>
- {% if obj.mode %}
- <div class="panel panel-default" id="vlans_panel">
- <div class="panel-heading"><strong>802.1Q VLANs</strong></div>
- {% include 'dcim/inc/interface_vlans_table.html' %}
- <div class="panel-footer text-right">
- <a href="{% url 'dcim:interface_assign_vlans' pk=obj.pk %}?return_url={% url 'virtualization:interface_edit' pk=obj.pk %}" class="btn btn-primary btn-xs{% if form.instance.mode == 100 and form.instance.untagged_vlan %} disabled{% endif %}">
- <i class="glyphicon glyphicon-plus"></i> Add VLANs
- </a>
- </div>
- </div>
- {% endif %}
{% endblock %}
{% block buttons %}
@@ -36,19 +27,4 @@
<button type="submit" name="_addanother" class="btn btn-primary">Create and Add Another</button>
{% endif %}
<a href="{{ return_url }}" class="btn btn-default">Cancel</a>
-{% endblock %}
-
-{% block javascript %}
- <script type="text/javascript">
- $(document).ready(function() {
- $('#clear_untagged_vlan').click(function () {
- $('input[name="untagged_vlan"]').prop("checked", false);
- return false;
- });
- $('#clear_tagged_vlans').click(function () {
- $('input[name="tagged_vlans"]').prop("checked", false);
- return false;
- });
- });
- </script>
-{% endblock %}
+{% endblock %}
\ No newline at end of file