NeoAnd/netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2025-12-20 20:32:25 -06:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

Closes #1739: Enabled custom fields for secrets

Browse Source
This commit is contained in:
Jeremy Stretch
2018-07-17 09:43:57 -04:00
parent 34a9573a0b
commit 278f7228eb
7 changed files with 32 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
netbox/secrets/forms.py
View File

@@ -7,8 +7,8 @@ from django.db.models import Count
from taggit.forms import TagField
from dcim.models import Device
from extras.forms import AddRemoveTagsForm
from utilities.forms import BootstrapMixin, BulkEditForm, FilterChoiceField, FlexibleModelChoiceField, SlugField
from extras.forms import AddRemoveTagsForm, CustomFieldBulkEditForm, CustomFieldFilterForm, CustomFieldForm
from utilities.forms import BootstrapMixin, FilterChoiceField, FlexibleModelChoiceField, SlugField
from .models import Secret, SecretRole, UserKey
@@ -59,7 +59,7 @@ class SecretRoleCSVForm(forms.ModelForm):
# Secrets
#
class SecretForm(BootstrapMixin, forms.ModelForm):
class SecretForm(BootstrapMixin, CustomFieldForm):
plaintext = forms.CharField(
max_length=65535,
required=False,
@@ -129,7 +129,7 @@ class SecretCSVForm(forms.ModelForm):
return s
class SecretBulkEditForm(BootstrapMixin, AddRemoveTagsForm, BulkEditForm):
class SecretBulkEditForm(BootstrapMixin, AddRemoveTagsForm, CustomFieldBulkEditForm):
pk = forms.ModelMultipleChoiceField(queryset=Secret.objects.all(), widget=forms.MultipleHiddenInput)
role = forms.ModelChoiceField(queryset=SecretRole.objects.all(), required=False)
name = forms.CharField(max_length=100, required=False)
@@ -138,7 +138,8 @@ class SecretBulkEditForm(BootstrapMixin, AddRemoveTagsForm, BulkEditForm):
nullable_fields = ['name']
class SecretFilterForm(BootstrapMixin, forms.Form):
class SecretFilterForm(BootstrapMixin, CustomFieldFilterForm):
model = Secret
q = forms.CharField(required=False, label='Search')
role = FilterChoiceField(
queryset=SecretRole.objects.annotate(filter_count=Count('secrets')),