From 11fa348575f513e0992a8a9b222a160ed6b791fa Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Thu, 19 Nov 2020 09:45:01 -0500
Subject: [PATCH] Fixes #5358: Fix user table configuration for VM interfaces

---
 docs/release-notes/version-2.10.md            |  8 ++
 netbox/netbox/settings.py                     |  2 +-
 .../virtualization/virtualmachine.html        | 82 ++++++++++---------
 netbox/virtualization/tables.py               |  8 +-
 netbox/virtualization/views.py                |  2 +-
 5 files changed, 57 insertions(+), 45 deletions(-)

diff --git a/docs/release-notes/version-2.10.md b/docs/release-notes/version-2.10.md
index d2182b0af..d2f0d56a2 100644
--- a/docs/release-notes/version-2.10.md
+++ b/docs/release-notes/version-2.10.md
@@ -1,5 +1,13 @@
 # NetBox v2.10
 
+## v2.10-beta2 (FUTURE)
+
+### Bug Fixes
+
+* [#5358](https://github.com/netbox-community/netbox/issues/5358) - Fix user table configuration for VM interfaces
+
+---
+
 ## v2.10-beta1 (2020-11-17)
 
 **NOTE:** This release completely removes support for embedded graphs.
diff --git a/netbox/netbox/settings.py b/netbox/netbox/settings.py
index a3f4f0b89..c915a7785 100644
--- a/netbox/netbox/settings.py
+++ b/netbox/netbox/settings.py
@@ -16,7 +16,7 @@ from django.core.validators import URLValidator
 # Environment setup
 #
 
-VERSION = '2.10-beta1'
+VERSION = '2.10-beta2'
 
 # Hostname
 HOSTNAME = platform.node()
diff --git a/netbox/templates/virtualization/virtualmachine.html b/netbox/templates/virtualization/virtualmachine.html
index 6a3aa1388..5058c97f2 100644
--- a/netbox/templates/virtualization/virtualmachine.html
+++ b/netbox/templates/virtualization/virtualmachine.html
@@ -266,54 +266,56 @@
 </div>
 <div class="row">
     <div class="col-md-12">
-        {% if perms.virtualization.change_vminterface or perms.virtualization.delete_vminterface %}
-            <form method="post">
+        <form method="post">
             {% csrf_token %}
             <input type="hidden" name="virtual_machine" value="{{ virtualmachine.pk }}" />
-        {% endif %}
-        <div class="panel panel-default">
-            <div class="panel-heading">
-                <strong>Interfaces</strong>
-                <div class="col-md-2 pull-right noprint">
-                    <input class="form-control interface-filter" type="text" placeholder="Filter" title="RegEx-enabled" style="height: 23px" />
+            <div class="panel panel-default">
+                <div class="panel-heading">
+                    <strong>Interfaces</strong>
+                    <div class="pull-right noprint">
+                        {% if request.user.is_authenticated %}
+                            <button type="button" class="btn btn-default btn-xs" data-toggle="modal" data-target="#VirtualMachineVMInterfaceTable_config" title="Configure table"><i class="mdi mdi-cog"></i> Configure</button>
+                        {% endif %}
+                    </div>
+                    <div class="pull-right col-md-2 noprint">
+                        <input class="form-control interface-filter" type="text" placeholder="Filter" title="Filter text (regular expressions supported)" style="height: 23px" />
+                    </div>
                 </div>
+                {% include 'responsive_table.html' with table=vminterface_table %}
+                {% if perms.virtualization.add_vminterface or perms.virtualization.delete_vminterface %}
+                    <div class="panel-footer noprint">
+                        {% if interfaces and perms.virtualization.change_vminterface %}
+                            <button type="submit" name="_rename" formaction="{% url 'virtualization:vminterface_bulk_rename' %}?return_url={{ virtualmachine.get_absolute_url }}" class="btn btn-warning btn-xs">
+                                <span class="mdi mdi-pencil" aria-hidden="true"></span> Rename
+                            </button>
+                            <button type="submit" name="_edit" formaction="{% url 'virtualization:vminterface_bulk_edit' %}?return_url={{ virtualmachine.get_absolute_url }}" class="btn btn-warning btn-xs">
+                                <span class="mdi mdi-pencil" aria-hidden="true"></span> Edit
+                            </button>
+                        {% endif %}
+                        {% if interfaces and perms.virtualization.delete_vminterface %}
+                            <button type="submit" name="_delete" formaction="{% url 'virtualization:vminterface_bulk_delete' %}?return_url={{ virtualmachine.get_absolute_url }}" class="btn btn-danger btn-xs">
+                                <span class="mdi mdi-trash-can-outline" aria-hidden="true"></span> Delete
+                            </button>
+                        {% endif %}
+                        {% if perms.virtualization.add_vminterface %}
+                            <div class="pull-right">
+                                <a href="{% url 'virtualization:vminterface_add' %}?virtual_machine={{ virtualmachine.pk }}&return_url={{ virtualmachine.get_absolute_url }}" class="btn btn-primary btn-xs">
+                                    <span class="mdi mdi-plus-thick" aria-hidden="true"></span> Add interfaces
+                                </a>
+                            </div>
+                            <div class="clearfix"></div>
+                        {% endif %}
+                     </div>
+                {% endif %}
             </div>
-            {% include 'responsive_table.html' with table=vminterface_table %}
-            {% if perms.virtualization.add_vminterface or perms.virtualization.delete_vminterface %}
-                <div class="panel-footer noprint">
-                    {% if interfaces and perms.virtualization.change_vminterface %}
-                        <button type="submit" name="_rename" formaction="{% url 'virtualization:vminterface_bulk_rename' %}?return_url={{ virtualmachine.get_absolute_url }}" class="btn btn-warning btn-xs">
-                            <span class="mdi mdi-pencil" aria-hidden="true"></span> Rename
-                        </button>
-                        <button type="submit" name="_edit" formaction="{% url 'virtualization:vminterface_bulk_edit' %}?return_url={{ virtualmachine.get_absolute_url }}" class="btn btn-warning btn-xs">
-                            <span class="mdi mdi-pencil" aria-hidden="true"></span> Edit
-                        </button>
-                    {% endif %}
-                    {% if interfaces and perms.virtualization.delete_vminterface %}
-                        <button type="submit" name="_delete" formaction="{% url 'virtualization:vminterface_bulk_delete' %}?return_url={{ virtualmachine.get_absolute_url }}" class="btn btn-danger btn-xs">
-                            <span class="mdi mdi-trash-can-outline" aria-hidden="true"></span> Delete
-                        </button>
-                    {% endif %}
-                    {% if perms.virtualization.add_vminterface %}
-                        <div class="pull-right">
-                            <a href="{% url 'virtualization:vminterface_add' %}?virtual_machine={{ virtualmachine.pk }}&return_url={{ virtualmachine.get_absolute_url }}" class="btn btn-primary btn-xs">
-                                <span class="mdi mdi-plus-thick" aria-hidden="true"></span> Add interfaces
-                            </a>
-                        </div>
-                        <div class="clearfix"></div>
-                    {% endif %}
-                 </div>
-            {% endif %}
-        </div>
-        {% if perms.virtualization.delete_vminterface %}
-            </form>
-        {% endif %}
+        </form>
+        {% table_config_form vminterface_table %}
 	</div>
 </div>
 {% include 'secrets/inc/private_key_modal.html' %}
 {% endblock %}
 
 {% block javascript %}
-<script src="{% static 'js/interface_filtering.js' %}?v{{ settings.VERSION }}"></script>
-<script src="{% static 'js/secrets.js' %}?v{{ settings.VERSION }}"></script>
+  <script src="{% static 'js/interface_filtering.js' %}?v{{ settings.VERSION }}"></script>
+  <script src="{% static 'js/tableconfig.js' %}?v{{ settings.VERSION }}"></script>
 {% endblock %}
diff --git a/netbox/virtualization/tables.py b/netbox/virtualization/tables.py
index 3132394d0..97e1d6e36 100644
--- a/netbox/virtualization/tables.py
+++ b/netbox/virtualization/tables.py
@@ -161,8 +161,8 @@ class VMInterfaceTable(BaseInterfaceTable):
     class Meta(BaseTable.Meta):
         model = VMInterface
         fields = (
-            'pk', 'virtual_machine', 'name', 'enabled', 'mac_address', 'mtu', 'description', 'tags', 'ip_addresses',
-            'untagged_vlan', 'tagged_vlans',
+            'pk', 'virtual_machine', 'name', 'enabled', 'mac_address', 'mtu', 'mode', 'description', 'tags',
+            'ip_addresses', 'untagged_vlan', 'tagged_vlans',
         )
         default_columns = ('pk', 'virtual_machine', 'name', 'enabled', 'description')
 
@@ -180,4 +180,6 @@ class VirtualMachineVMInterfaceTable(VMInterfaceTable):
             'pk', 'name', 'enabled', 'mac_address', 'mtu', 'mode', 'description', 'tags', 'ip_addresses',
             'untagged_vlan', 'tagged_vlans', 'actions',
         )
-        default_columns = ('pk', 'name', 'enabled', 'mac_address', 'mtu', 'mode', 'description', 'actions')
+        default_columns = (
+            'pk', 'name', 'enabled', 'mac_address', 'mtu', 'mode', 'description', 'ip_addresses', 'actions',
+        )
diff --git a/netbox/virtualization/views.py b/netbox/virtualization/views.py
index f04175c19..e22ad670c 100644
--- a/netbox/virtualization/views.py
+++ b/netbox/virtualization/views.py
@@ -246,7 +246,7 @@ class VirtualMachineView(generic.ObjectView):
         ).prefetch_related(
             Prefetch('ip_addresses', queryset=IPAddress.objects.restrict(request.user))
         )
-        vminterface_table = tables.VirtualMachineVMInterfaceTable(vminterfaces, orderable=False)
+        vminterface_table = tables.VirtualMachineVMInterfaceTable(vminterfaces, user=request.user, orderable=False)
         if request.user.has_perm('virtualization.change_vminterface') or \
                 request.user.has_perm('virtualization.delete_vminterface'):
             vminterface_table.columns.show('pk')