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

Fixes #5358: Fix user table configuration for VM interfaces

Browse Source
This commit is contained in:
Jeremy Stretch 2020-11-19 09:45:01 -05:00
parent 16a95beb22
commit 11fa348575
5 changed files with 57 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
docs/release-notes/version-2.10.md
View File

@ -1,5 +1,13 @@
# NetBox v2.10 # 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) ## v2.10-beta1 (2020-11-17)
**NOTE:** This release completely removes support for embedded graphs. **NOTE:** This release completely removes support for embedded graphs.

2
netbox/netbox/settings.py
View File

@ -16,7 +16,7 @@ from django.core.validators import URLValidator
# Environment setup # Environment setup
# #
VERSION = '2.10-beta1' VERSION = '2.10-beta2'
# Hostname # Hostname
HOSTNAME = platform.node() HOSTNAME = platform.node()

18
netbox/templates/virtualization/virtualmachine.html
View File

@ -266,16 +266,19 @@
</div> </div>
<div class="row"> <div class="row">
<div class="col-md-12"> <div class="col-md-12">
{% if perms.virtualization.change_vminterface or perms.virtualization.delete_vminterface %}
<form method="post"> <form method="post">
{% csrf_token %} {% csrf_token %}
<input type="hidden" name="virtual_machine" value="{{ virtualmachine.pk }}" /> <input type="hidden" name="virtual_machine" value="{{ virtualmachine.pk }}" />
{% endif %}
<div class="panel panel-default"> <div class="panel panel-default">
<div class="panel-heading"> <div class="panel-heading">
<strong>Interfaces</strong> <strong>Interfaces</strong>
<div class="col-md-2 pull-right noprint"> <div class="pull-right noprint">
<input class="form-control interface-filter" type="text" placeholder="Filter" title="RegEx-enabled" style="height: 23px" /> {% 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>
</div> </div>
{% include 'responsive_table.html' with table=vminterface_table %} {% include 'responsive_table.html' with table=vminterface_table %}
@ -305,15 +308,14 @@
</div> </div>
{% endif %} {% endif %}
</div> </div>
{% if perms.virtualization.delete_vminterface %}
</form> </form>
{% endif %} {% table_config_form vminterface_table %}
</div> </div>
</div> </div>
{% include 'secrets/inc/private_key_modal.html' %} {% include 'secrets/inc/private_key_modal.html' %}
{% endblock %} {% endblock %}
{% block javascript %} {% block javascript %}
<script src="{% static 'js/interface_filtering.js' %}?v{{ settings.VERSION }}"></script> <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/tableconfig.js' %}?v{{ settings.VERSION }}"></script>
{% endblock %} {% endblock %}

8
netbox/virtualization/tables.py
View File

@ -161,8 +161,8 @@ class VMInterfaceTable(BaseInterfaceTable):
class Meta(BaseTable.Meta): class Meta(BaseTable.Meta):
model = VMInterface model = VMInterface
fields = ( fields = (
'pk', 'virtual_machine', 'name', 'enabled', 'mac_address', 'mtu', 'description', 'tags', 'ip_addresses', 'pk', 'virtual_machine', 'name', 'enabled', 'mac_address', 'mtu', 'mode', 'description', 'tags',
'untagged_vlan', 'tagged_vlans', 'ip_addresses', 'untagged_vlan', 'tagged_vlans',
) )
default_columns = ('pk', 'virtual_machine', 'name', 'enabled', 'description') 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', 'pk', 'name', 'enabled', 'mac_address', 'mtu', 'mode', 'description', 'tags', 'ip_addresses',
'untagged_vlan', 'tagged_vlans', 'actions', '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',
)

2
netbox/virtualization/views.py
View File

@ -246,7 +246,7 @@ class VirtualMachineView(generic.ObjectView):
).prefetch_related( ).prefetch_related(
Prefetch('ip_addresses', queryset=IPAddress.objects.restrict(request.user)) 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 \ if request.user.has_perm('virtualization.change_vminterface') or \
request.user.has_perm('virtualization.delete_vminterface'): request.user.has_perm('virtualization.delete_vminterface'):
vminterface_table.columns.show('pk') vminterface_table.columns.show('pk')