From 5963f7ed011829f3347bd460a7ed4a2ad3f9cd6d Mon Sep 17 00:00:00 2001 From: Oliver Walters Date: Wed, 14 Aug 2019 13:54:16 +1000 Subject: [PATCH] Deleted unused form --- InvenTree/part/forms.py | 12 ------------ .../templates/part/bom_upload/select_fields.html | 3 --- InvenTree/part/views.py | 15 ++++----------- 3 files changed, 4 insertions(+), 26 deletions(-) diff --git a/InvenTree/part/forms.py b/InvenTree/part/forms.py index 38280bbc1c..286f8ac451 100644 --- a/InvenTree/part/forms.py +++ b/InvenTree/part/forms.py @@ -51,18 +51,6 @@ class BomUploadSelectFile(HelperForm): ] -class BomUploadSelectFields(HelperForm): - """ Form for selecting BOM fields """ - - starting_row = forms.IntegerField(required=True, initial=2, help_text='Index of starting row', validators=[MinValueValidator(1)]) - - class Meta: - model = Part - fields = [ - 'starting_row', - ] - - class EditPartAttachmentForm(HelperForm): """ Form for editing a PartAttachment object """ diff --git a/InvenTree/part/templates/part/bom_upload/select_fields.html b/InvenTree/part/templates/part/bom_upload/select_fields.html index 026ffb1a40..21849f31f8 100644 --- a/InvenTree/part/templates/part/bom_upload/select_fields.html +++ b/InvenTree/part/templates/part/bom_upload/select_fields.html @@ -24,9 +24,6 @@
{% csrf_token %} - {% load crispy_forms_tags %} - - {% crispy form %} diff --git a/InvenTree/part/views.py b/InvenTree/part/views.py index b7bed73003..b3e9807404 100644 --- a/InvenTree/part/views.py +++ b/InvenTree/part/views.py @@ -671,13 +671,8 @@ class BomUpload(FormView): def get_form_class(self): - form_step = self.request.POST.get('form_step', None) - - if form_step == 'select_fields': - return part_forms.BomUploadSelectFields - else: - # Default form is the starting point - return part_forms.BomUploadSelectFile + # Default form is the starting point + return part_forms.BomUploadSelectFile def get_context_data(self, *args, **kwargs): @@ -776,7 +771,7 @@ class BomUpload(FormView): if bom_file_valid: # BOM file is valid? Proceed to the next step! - form = part_forms.BomUploadSelectFields + form = None self.template_name = 'part/bom_upload/select_fields.html' self.extractDataFromFile(manager) @@ -983,8 +978,6 @@ class BomUpload(FormView): self.getTableDataFromPost() valid = len(self.missing_columns) == 0 and not self.duplicates - - form = part_forms.BomUploadSelectFields if valid: # Try to extract meaningful data @@ -994,7 +987,7 @@ class BomUpload(FormView): else: self.template_name = 'part/bom_upload/select_fields.html' - return self.render_to_response(self.get_context_data(form=form)) + return self.render_to_response(self.get_context_data(form=None)) def handlePartSelection(self):