Merge 231b1d3 into a4e0a2d

collective · Feb 24, 2021 · cff3cb9 · cff3cb9
2 parents a4e0a2d + 231b1d3
commit cff3cb9
Showing 1 changed file with 8 additions and 6 deletions.
diff --git a/src/collective/documentgenerator/browser/generation_view.py b/src/collective/documentgenerator/browser/generation_view.py
@@ -381,8 +381,9 @@ class PersistentDocumentGenerationView(DocumentGenerationView):
     """
 
     def __call__(self, template_uid='', output_format='', generated_doc_title=''):
+        self.generated_doc_title = generated_doc_title
         self.pod_template, self.output_format = self._get_base_args(template_uid, output_format)
-        persisted_doc = self.generate_persistent_doc(self.pod_template, self.output_format, generated_doc_title)
+        persisted_doc = self.generate_persistent_doc(self.pod_template, self.output_format)
         self.redirects(persisted_doc)
 
     def add_mailing_infos(self, doc, gen_context):
@@ -394,13 +395,13 @@ def add_mailing_infos(self, doc, gen_context):
             annot['documentgenerator'] = {'need_mailing': True, 'template_uid': self.pod_template.UID(),
                                           'output_format': self.output_format, 'context_uid': self.context.UID()}
 
-    def _get_title(self, doc_name, gen_context, generated_doc_title):
+    def _get_title(self, doc_name, gen_context):
         splitted_name = doc_name.split('.')
-        title = generated_doc_title or self.pod_template.title
+        title = self.generated_doc_title or self.pod_template.title
         extension = splitted_name[-1]
         return safe_unicode(title), extension
 
-    def generate_persistent_doc(self, pod_template, output_format, generated_doc_title):
+    def generate_persistent_doc(self, pod_template, output_format):
         """
         Generate a document of format 'output_format' from the template
         'pod_template' and persist it by creating a File containing the
@@ -409,7 +410,7 @@ def generate_persistent_doc(self, pod_template, output_format, generated_doc_tit
 
         doc, doc_name, gen_context = self._generate_doc(pod_template, output_format)
 
-        title, extension = self._get_title(doc_name, gen_context, generated_doc_title)
+        title, extension = self._get_title(doc_name, gen_context)
 
         factory = queryAdapter(self.context, IDocumentFactory)
 
@@ -463,6 +464,7 @@ class MailingLoopPersistentDocumentGenerationView(PersistentDocumentGenerationVi
     """
 
     def __call__(self, document_uid='', document_url_path='', generated_doc_title=''):
+        self.generated_doc_title = generated_doc_title
         document_uid = document_uid or self.request.get('document_uid', '')
         document_url_path = document_url_path or self.request.get('document_url_path', '')
         if not document_uid and not document_url_path:
@@ -475,7 +477,7 @@ def __call__(self, document_uid='', document_url_path='', generated_doc_title=''
         if not self.document:
             raise Exception("Cannot find document with UID '{0}'".format(document_uid))
         self.pod_template, self.output_format = self._get_base_args('', '')
-        persisted_doc = self.generate_persistent_doc(self.pod_template, self.output_format, generated_doc_title)
+        persisted_doc = self.generate_persistent_doc(self.pod_template, self.output_format)
         self.redirects(persisted_doc)
 
     def _get_base_args(self, template_uid, output_format):