Mirrored_Repos/InvenTree
1
0
Fork 0
mirror of https://github.com/inventree/InvenTree synced 2024-08-30 18:33:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

Render GET as a formview rather than ajaxview

Browse Source
This commit is contained in:
Oliver Walters 2019-07-02 19:02:19 +10:00
parent 3c44fcaf5b
commit 802255c62d
2 changed files with 18 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
InvenTree/part/templates/part/bom_upload/upload_file.html
View File

@ -8,11 +8,6 @@
<h4>Upload Bill of Materials</h4> <h4>Upload Bill of Materials</h4>
<hr> <hr>
<p>
Select a BOM file to upload for:<br>
<b>{{ part.name }} - <i>{{ part.description }}</i></b>
</p>
<p>The BOM file must contain the required named columns as provided in the <a href="/part/bom_template/">BOM Upload Template</a></a></p> <p>The BOM file must contain the required named columns as provided in the <a href="/part/bom_template/">BOM Upload Template</a></a></p>
<form method="post" action='' class='js-modal-form' enctype="multipart/form-data"> <form method="post" action='' class='js-modal-form' enctype="multipart/form-data">
@ -21,8 +16,9 @@
<input type='hidden' name='form_step' value='select_file'/> <input type='hidden' name='form_step' value='select_file'/>
{% crispy form %] {% crispy form %}
<button type="submit" class="save btn btn-default">Upload</button>
</form> </form>
{% endblock %} {% endblock %}

26
InvenTree/part/views.py
View File

@ -8,8 +8,8 @@ from __future__ import unicode_literals
from django.core.exceptions import ValidationError from django.core.exceptions import ValidationError
from django.shortcuts import get_object_or_404 from django.shortcuts import get_object_or_404
from django.utils.translation import gettext_lazy as _ from django.utils.translation import gettext_lazy as _
from django.urls import reverse_lazy from django.urls import reverse, reverse_lazy
from django.views.generic import DetailView, ListView from django.views.generic import DetailView, ListView, FormView
from django.views.generic.edit import FormMixin from django.views.generic.edit import FormMixin
from django.forms.models import model_to_dict from django.forms.models import model_to_dict
from django.forms import HiddenInput, CheckboxInput from django.forms import HiddenInput, CheckboxInput
@ -620,7 +620,7 @@ class BomValidate(AjaxUpdateView):
return self.renderJsonResponse(request, form, data, context=self.get_context()) return self.renderJsonResponse(request, form, data, context=self.get_context())
class BomUpload(AjaxView, FormMixin): class BomUpload(FormView):
""" View for uploading a BOM file, and handling BOM data importing. """ View for uploading a BOM file, and handling BOM data importing.
The BOM upload process is as follows: The BOM upload process is as follows:
@ -647,8 +647,11 @@ class BomUpload(AjaxView, FormMixin):
During these steps, data are passed between the server/client as JSON objects. During these steps, data are passed between the server/client as JSON objects.
""" """
ajax_form_title = 'Upload Bill of Materials' template_name = 'part/bom_upload/select_file.html'
ajax_template_name = 'part/bom_upload/select_file.html'
def get_success_url(self):
part = self.get_object()
return reverse('upload-bom', kwargs={'pk': part.id})
def get_form_class(self): def get_form_class(self):
@ -660,10 +663,11 @@ class BomUpload(AjaxView, FormMixin):
# Default form is the starting point # Default form is the starting point
return part_forms.BomUploadSelectFile return part_forms.BomUploadSelectFile
def get_context_data(self): def get_context_data(self, *args, **kwargs):
ctx = {
'part': self.part ctx = super().get_context_data(*args, **kwargs)
}
ctx['part'] = self.part
return ctx return ctx
@ -679,7 +683,9 @@ class BomUpload(AjaxView, FormMixin):
self.form = self.get_form() self.form = self.get_form()
return self.renderJsonResponse(request, self.form) form_class = self.get_form_class()
form = self.get_form(form_class)
return self.render_to_response(self.get_context_data(form=form))
def handleBomFileUpload(self): def handleBomFileUpload(self):
""" Process a BOM file upload form. """ Process a BOM file upload form.