From a2a2c61e31de5bf0af7679ea737ae5be18dcaae7 Mon Sep 17 00:00:00 2001
From: Matthias <matmair@live.de>
Date: Sun, 6 Jun 2021 16:36:01 +0200
Subject: [PATCH] refactor and fix rendering on error

---
 InvenTree/common/views.py | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/InvenTree/common/views.py b/InvenTree/common/views.py
index 5bdaf03df3..c52c063cbf 100644
--- a/InvenTree/common/views.py
+++ b/InvenTree/common/views.py
@@ -580,7 +580,6 @@ class FileManagementAjaxView(AjaxView):
         else:
             self.storage.current_step = self.steps.next
 
-        self.setTemplate()
         return self.renderJsonResponse(request, data={'form_valid': None})
 
     def get(self, request):
@@ -588,9 +587,13 @@ class FileManagementAjaxView(AjaxView):
             # reset form
             self.storage.reset()
             self.storage.current_step = self.steps.first
-        self.setTemplate()
         return self.renderJsonResponse(request)
 
+    def renderJsonResponse(self, request, form=None, data={}, context=None):
+        """ always set the right templates before rendering """
+        self.setTemplate()
+        return super().renderJsonResponse(request, form=form, data=data, context=context)
+
     def get_data(self):
         data = super().get_data()
         data['hideErrorMessage'] = '1'