diff --git a/InvenTree/InvenTree/views.py b/InvenTree/InvenTree/views.py index b59f0910a6..7c5d900d42 100644 --- a/InvenTree/InvenTree/views.py +++ b/InvenTree/InvenTree/views.py @@ -105,9 +105,9 @@ class AjaxView(AjaxMixin, View): class AjaxCreateView(AjaxMixin, CreateView): def post(self, request, *args, **kwargs): + form = self.form_class(data=request.POST, files=request.FILES) if request.is_ajax(): - form = self.form_class(request.POST) data = {'form_valid': form.is_valid()} @@ -141,8 +141,9 @@ class AjaxUpdateView(AjaxMixin, UpdateView): def post(self, request, *args, **kwargs): + form = self.form_class(instance=self.get_object(), data=request.POST, files=request.FILES) + if request.is_ajax(): - form = self.form_class(request.POST, instance=self.get_object()) data = {'form_valid': form.is_valid()} @@ -152,10 +153,10 @@ class AjaxUpdateView(AjaxMixin, UpdateView): data['pk'] = obj.id data['url'] = obj.get_absolute_url() - return self.renderJsonResponse(request, form, data) + response = self.renderJsonResponse(request, form, data) + return response else: - response = super(UpdateView, self).post(request, *args, **kwargs) return response def get(self, request, *args, **kwargs): @@ -168,7 +169,7 @@ class AjaxUpdateView(AjaxMixin, UpdateView): return self.renderJsonResponse(request, form) else: - return response + return super(UpdateView, self).post(request, *args, **kwargs) class AjaxDeleteView(AjaxMixin, DeleteView): diff --git a/InvenTree/part/templates/part/detail.html b/InvenTree/part/templates/part/detail.html index 7436105ba0..bdd7863e3c 100644 --- a/InvenTree/part/templates/part/detail.html +++ b/InvenTree/part/templates/part/detail.html @@ -92,7 +92,7 @@ launchModalForm("#modal-form", "{% url 'part-edit' part.id %}", { - reload: true + reload: true, }); }); diff --git a/InvenTree/part/templates/part/part_base.html b/InvenTree/part/templates/part/part_base.html index 85f15967ca..4b3f9ae6f4 100644 --- a/InvenTree/part/templates/part/part_base.html +++ b/InvenTree/part/templates/part/part_base.html @@ -89,6 +89,9 @@ $("#part-thumb").click(function() { launchModalForm("#modal-form", "{% url 'part-image' part.id %}", + { + reload: true + } ); }); {% endblock %} \ No newline at end of file diff --git a/InvenTree/part/views.py b/InvenTree/part/views.py index f74836197c..f11a328af2 100644 --- a/InvenTree/part/views.py +++ b/InvenTree/part/views.py @@ -96,6 +96,11 @@ class PartImage(AjaxUpdateView): ajax_form_title = 'Upload Part Image' form_class = PartImageForm + def get_data(self): + return { + 'success': 'Updated part image', + } + class PartEdit(AjaxUpdateView): model = Part