summaryrefslogtreecommitdiff
path: root/ishtar_common/views.py
diff options
context:
space:
mode:
authorÉtienne Loks <etienne.loks@iggdrasil.net>2018-03-07 13:42:42 +0100
committerÉtienne Loks <etienne.loks@iggdrasil.net>2018-03-08 11:39:56 +0100
commitee4daac3b1d22e3ff3890efee015253f3e4b9e7a (patch)
tree7a9d79d049c6214b519f57a6f429f7081fe50fc5 /ishtar_common/views.py
parent9bce419add91a8ac4d4ac8ac5e78cab456204836 (diff)
downloadIshtar-ee4daac3b1d22e3ff3890efee015253f3e4b9e7a.tar.bz2
Ishtar-ee4daac3b1d22e3ff3890efee015253f3e4b9e7a.zip
Make background task not mandatory (refs #3951)
Diffstat (limited to 'ishtar_common/views.py')
-rw-r--r--ishtar_common/views.py7
1 files changed, 4 insertions, 3 deletions
diff --git a/ishtar_common/views.py b/ishtar_common/views.py
index dfeff037d..66642090f 100644
--- a/ishtar_common/views.py
+++ b/ishtar_common/views.py
@@ -1815,9 +1815,10 @@ class ImportListView(IshtarMixin, LoginRequiredMixin, ListView):
elif action == 'A':
imprt.initialize(user=self.request.user.ishtaruser)
elif action == 'I':
- imprt.importation()
- elif action == 'ID':
- imprt.delayed_importation(request.session.session_key)
+ if settings.USE_BACKGROUND_TASK:
+ imprt.delayed_importation(request.session.session_key)
+ else:
+ imprt.importation()
elif action == 'AC':
imprt.archive()
return HttpResponseRedirect(reverse(self.current_url))