mirror/netbox-community-netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2024-05-10 07:54:54 +00:00
Code Activity

Fixes #1502: Fixed CSV export for clusters and virtual machines

Browse Source
This commit is contained in:
Jeremy Stretch
2017-09-18 13:12:58 -04:00
parent e5e169f476
commit 9927ce14d3
2 changed files with 34 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
netbox/virtualization/forms.py
View File

@@ -76,16 +76,17 @@ class ClusterCSVForm(forms.ModelForm):
class Meta:
model = Cluster
fields = ['name', 'type', 'group']
fields = ['name', 'type', 'group', 'comments']
class ClusterBulkEditForm(BootstrapMixin, CustomFieldBulkEditForm):
pk = forms.ModelMultipleChoiceField(queryset=Cluster.objects.all(), widget=forms.MultipleHiddenInput)
type = forms.ModelChoiceField(queryset=ClusterType.objects.all(), required=False)
group = forms.ModelChoiceField(queryset=ClusterGroup.objects.all(), required=False)
comments = CommentField(widget=SmallTextarea)
class Meta:
nullable_fields = ['group']
nullable_fields = ['group', 'comments']
class ClusterFilterForm(BootstrapMixin, CustomFieldFilterForm):
@@ -252,7 +253,7 @@ class VirtualMachineBulkEditForm(BootstrapMixin, CustomFieldBulkEditForm):
comments = CommentField(widget=SmallTextarea)
class Meta:
nullable_fields = ['tenant', 'platform', 'vcpus', 'memory', 'disk']
nullable_fields = ['tenant', 'platform', 'vcpus', 'memory', 'disk', 'comments']
def vm_status_choices():