From aac08521288a8498b35ac1dc8de11d20cddbfa8b Mon Sep 17 00:00:00 2001
From: Roberto Rosario <roberto.rosario.gonzalez@gmail.com>
Date: Wed, 5 Sep 2018 01:03:40 -0400
Subject: [PATCH] Clean up document download view class.

Signed-off-by: Roberto Rosario <roberto.rosario.gonzalez@gmail.com>
---
 mayan/apps/documents/views/document_views.py | 57 ++++++++++----------
 1 file changed, 27 insertions(+), 30 deletions(-)

diff --git a/mayan/apps/documents/views/document_views.py b/mayan/apps/documents/views/document_views.py
index 8f51b145bb..b7b701e7c9 100644
--- a/mayan/apps/documents/views/document_views.py
+++ b/mayan/apps/documents/views/document_views.py
@@ -430,6 +430,33 @@ class DocumentDownloadFormView(FormView):
     querystring_form_fields = ('compressed', 'zip_filename')
     single_download_view = 'documents:document_download'
 
+    def form_valid(self, form):
+        querystring_dictionary = {}
+
+        for field in self.querystring_form_fields:
+            data = form.cleaned_data[field]
+            if data:
+                querystring_dictionary[field] = data
+
+        querystring_dictionary.update(
+            {
+                'id_list': ','.join(
+                    map(str, self.queryset.values_list('pk', flat=True))
+                )
+            }
+        )
+
+        querystring = urlencode(querystring_dictionary, doseq=True)
+
+        if self.queryset.count() > 1:
+            url = reverse(self.multiple_download_view)
+        else:
+            url = reverse(
+                self.single_download_view, args=(self.queryset.first().pk,)
+            )
+
+        return HttpResponseRedirect('{}?{}'.format(url, querystring))
+
     def get_document_queryset(self):
         id_list = self.request.GET.get(
             'id_list', self.request.POST.get('id_list', '')
@@ -472,36 +499,6 @@ class DocumentDownloadFormView(FormView):
         kwargs.update({'queryset': self.queryset})
         return kwargs
 
-    def form_valid(self, form):
-        querystring_dictionary = {}
-
-        for field in self.querystring_form_fields:
-            data = form.cleaned_data[field]
-            if data:
-                querystring_dictionary[field] = data
-
-        querystring_dictionary.update(
-            {
-                'id_list': ','.join(
-                    map(str, self.queryset.values_list('pk', flat=True))
-                )
-            }
-        )
-
-        querystring = urlencode(querystring_dictionary, doseq=True)
-
-        if self.queryset.count() > 1:
-            url = reverse(self.multiple_download_view)
-        else:
-            url = reverse(
-                self.single_download_view, args=(self.queryset.first().pk,)
-            )
-
-        return HttpResponseRedirect('{}?{}'.format(url, querystring))
-
-    def get_post_action_redirect(self):
-        return self.post_action_redirect
-
     def get_queryset(self):
         return AccessControlList.objects.filter_by_access(
             permission_document_download, self.request.user,