Documents: redirects - multiple del

1 files changed, 10 insertions, 2 deletions

diff --git a/ishtar_common/views.py b/ishtar_common/views.py
index 150dfa2ca..710d6d7e6 100644
--- a/ishtar_common/views.py
+++ b/ishtar_common/views.py
@@ -1887,7 +1887,7 @@ class DocumentFormMixin(IshtarMixin, LoginRequiredMixin):
     model = models.Document
 
     def get_success_url(self):
-        return reverse('display-document', args=[self.object.pk])
+        return reverse("edit-document") + "?open_item={}".format(self.object.pk)
 
 
 class DocumentCreateView(DocumentFormMixin, CreateView):
@@ -1919,6 +1919,14 @@ class DocumentSelectView(IshtarMixin, LoginRequiredMixin,
         self.pk = form.cleaned_data['pk']
         return super(DocumentSelectView, self).form_valid(form)
 
+    def get_context_data(self, **kwargs):
+        data = super(DocumentSelectView, self).get_context_data(**kwargs)
+        if self.request.GET and "open_item" in self.request.GET:
+            data["open_url"] =\
+                reverse("show-document",
+                        args=[self.request.GET["open_item"]]) + "/"
+        return data
+
     def get_success_url(self):
         return reverse(self.redir_url, args=[self.pk])
 
@@ -1964,7 +1972,7 @@ class DocumentEditView(DocumentFormMixin, UpdateView):
 
 
 document_deletion_steps = [
-    ('selec-document_deletion', forms.DocumentFormSelection),
+    ('selec-document_deletion', forms.DocumentFormMultiSelection),
     ('final-document_deletion', FinalDeleteForm)
 ]