NeoAnd/netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2026-01-25 12:59:59 -06:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Merge branch 'develop' into feature

Browse Source
This commit is contained in:
Jeremy Stretch
2024-11-21 14:00:57 -05:00
parent a0b4b0afe0 9c7f2ec98c
commit f08e36e538
68 changed files with 5406 additions and 4794 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
netbox/virtualization/forms/bulk_edit.py
View File

@@ -153,7 +153,7 @@ class VirtualMachineBulkEditForm(NetBoxModelBulkEditForm):
)
disk = forms.IntegerField(
required=False,
label=_('Disk (GB)')
label=_('Disk (MB)')
)
description = forms.CharField(
label=_('Description'),
@@ -313,7 +313,7 @@ class VirtualDiskBulkEditForm(NetBoxModelBulkEditForm):
)
size = forms.IntegerField(
required=False,
label=_('Size (GB)')
label=_('Size (MB)')
)
description = forms.CharField(
label=_('Description'),

2
netbox/virtualization/forms/filtersets.py
View File

@@ -253,7 +253,7 @@ class VirtualDiskFilterForm(NetBoxModelFilterSetForm):
label=_('Virtual machine')
)
size = forms.IntegerField(
label=_('Size (GB)'),
label=_('Size (MB)'),
required=False,
min_value=1
)