Document QA: packaging - fix QA for search and edit

1 files changed, 31 insertions, 0 deletions

diff --git a/ishtar_common/views.py b/ishtar_common/views.py
index 64219ba66..160653bbb 100644
--- a/ishtar_common/views.py
+++ b/ishtar_common/views.py
@@ -1988,6 +1988,11 @@ class DocumentSelectView(IshtarMixin, LoginRequiredMixin,
         self.pk = form.cleaned_data['pk']
         return super(DocumentSelectView, self).form_valid(form)
 
+    def get_form_kwargs(self):
+        kwargs = super(DocumentSelectView, self).get_form_kwargs()
+        kwargs["user"] = self.request.user
+        return kwargs
+
     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:
@@ -2435,3 +2440,29 @@ class QADocumentDuplicateFormView(QAItemForm):
         return data
 
 
+class QADocumentPackagingFormView(QAItemForm):
+    template_name = 'ishtar/forms/qa_document_packaging.html'
+    model = models.Document
+    form_class = forms.QADocumentPackagingForm
+    page_name = _(u"Packaging")
+    base_url = "document-qa-packaging"
+
+    def dispatch(self, request, *args, **kwargs):
+        returned = super(QADocumentPackagingFormView, self).dispatch(
+            request, *args, **kwargs)
+        """
+        for item in self.items:
+            if item.is_locked(request.user):
+                return HttpResponseRedirect(reverse("qa-not-available"))
+        """
+        return returned
+
+    def get_form_kwargs(self):
+        kwargs = super(QADocumentPackagingFormView, self).get_form_kwargs()
+        kwargs['user'] = self.request.user
+        kwargs['prefix'] = "qa-packaging"
+        return kwargs
+
+    def form_valid(self, form):
+        form.save(self.items, self.request.user)
+        return HttpResponseRedirect(reverse("success"))