12591 form cleanup

This commit is contained in:
Arthur 2023-06-14 11:30:45 -07:00
parent a1dd3c4381
commit 6da65e0763
4 changed files with 0 additions and 83 deletions

View File

@ -9,7 +9,6 @@ from utilities.forms.widgets import BulkEditNullBooleanSelect
__all__ = (
'ConfigContextBulkEditForm',
'ConfigRevisionBulkEditForm',
'ConfigTemplateBulkEditForm',
'CustomFieldBulkEditForm',
'CustomLinkBulkEditForm',
@ -21,38 +20,6 @@ __all__ = (
)
class ConfigRevisionBulkEditForm(BulkEditForm):
pk = forms.ModelMultipleChoiceField(
queryset=CustomField.objects.all(),
widget=forms.MultipleHiddenInput
)
group_name = forms.CharField(
required=False
)
description = forms.CharField(
required=False
)
required = forms.NullBooleanField(
required=False,
widget=BulkEditNullBooleanSelect()
)
weight = forms.IntegerField(
required=False
)
ui_visibility = forms.ChoiceField(
label=_("UI visibility"),
choices=add_blank_choice(CustomFieldVisibilityChoices),
required=False,
initial=''
)
is_cloneable = forms.NullBooleanField(
required=False,
widget=BulkEditNullBooleanSelect()
)
nullable_fields = ('group_name', 'description',)
class CustomFieldBulkEditForm(BulkEditForm):
pk = forms.ModelMultipleChoiceField(
queryset=CustomField.objects.all(),

View File

@ -12,7 +12,6 @@ from utilities.forms import CSVModelForm
from utilities.forms.fields import CSVChoiceField, CSVContentTypeField, CSVMultipleContentTypeField, SlugField
__all__ = (
'ConfigRevisionImportForm',
'ConfigTemplateImportForm',
'CustomFieldImportForm',
'CustomLinkImportForm',
@ -24,41 +23,6 @@ __all__ = (
)
class ConfigRevisionImportForm(CSVModelForm):
content_types = CSVMultipleContentTypeField(
queryset=ContentType.objects.all(),
limit_choices_to=FeatureQuery('custom_fields'),
help_text=_("One or more assigned object types")
)
type = CSVChoiceField(
choices=CustomFieldTypeChoices,
help_text=_('Field data type (e.g. text, integer, etc.)')
)
object_type = CSVContentTypeField(
queryset=ContentType.objects.all(),
limit_choices_to=FeatureQuery('custom_fields'),
required=False,
help_text=_("Object type (for object or multi-object fields)")
)
choices = SimpleArrayField(
base_field=forms.CharField(),
required=False,
help_text=_('Comma-separated list of field choices')
)
ui_visibility = CSVChoiceField(
choices=CustomFieldVisibilityChoices,
help_text=_('How the custom field is displayed in the user interface')
)
class Meta:
model = CustomField
fields = (
'name', 'label', 'group_name', 'type', 'content_types', 'object_type', 'required', 'description',
'search_weight', 'filter_logic', 'default', 'choices', 'weight', 'validation_minimum', 'validation_maximum',
'validation_regex', 'ui_visibility', 'is_cloneable',
)
class CustomFieldImportForm(CSVModelForm):
content_types = CSVMultipleContentTypeField(
queryset=ContentType.objects.all(),

View File

@ -119,8 +119,6 @@ urlpatterns = [
# Config Revision
path('config-revision/', views.ConfigRevisionListView.as_view(), name='configrevision'),
path('config-revision/add/', views.ConfigRevisionEditView.as_view(), name='configrevision_add'),
# path('custom-revision/import/', views.ConfigRevisionBulkImportView.as_view(), name='configrevision_import'),
# path('config-revision/edit/', views.ConfigRevisionBulkEditView.as_view(), name='configrevision_bulk_edit'),
path('config-revision/delete/', views.ConfigRevisionBulkDeleteView.as_view(), name='configrevision_bulk_delete'),
path('config-revision/<int:pk>/', include(get_model_urls('extras', 'configrevision'))),
]

View File

@ -1219,18 +1219,6 @@ class ConfigRevisionDeleteView(generic.ObjectDeleteView):
queryset = ConfigRevision.objects.all()
class ConfigRevisionBulkImportView(generic.BulkImportView):
queryset = ConfigRevision.objects.all()
model_form = forms.ConfigRevisionImportForm
class ConfigRevisionBulkEditView(generic.BulkEditView):
queryset = ConfigRevision.objects.all()
filterset = filtersets.ConfigRevisionFilterSet
table = tables.ConfigRevisionTable
form = forms.ConfigRevisionBulkEditForm
class ConfigRevisionBulkDeleteView(generic.BulkDeleteView):
queryset = ConfigRevision.objects.all()
filterset = filtersets.ConfigRevisionFilterSet