Merge pull request #459 from ColonelThirtyTwo/fix-project-report-extr…

…a-fields Fix project extra fields not being processed on project reports
GhostManager · Jun 17, 2024 · ce19c59 · ce19c59
2 parents d344d6f + c7abc5b
commit ce19c59
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 11 deletions.
diff --git a/ghostwriter/modules/reportwriter/project/base.py b/ghostwriter/modules/reportwriter/project/base.py
@@ -34,13 +34,6 @@ def map_rich_texts(self):
         # Fields on Project
         ExportProjectBase.process_projects_richtext(self, base_context, rich_text_context)
 
-        # Project
-        base_context["project"]["note_rt"] = self.create_lazy_template(
-            "project note",
-            base_context["project"]["note"],
-            rich_text_context,
-        )
-
         return base_context
 
     @staticmethod
@@ -90,6 +83,10 @@ def process_projects_richtext(
             rich_text_context
         )
 
+        # Project
+        base_context["project"]["note_rt"] = ex.create_lazy_template("the project note", base_context["project"]["note"], rich_text_context)
+        ex.process_extra_fields("the project", base_context["project"]["extra_fields"], Project, rich_text_context)
+
         # Assignments
         for assignment in base_context["team"]:
             if isinstance(assignment, dict):

diff --git a/ghostwriter/modules/reportwriter/report/docx.py b/ghostwriter/modules/reportwriter/report/docx.py
@@ -1,13 +1,9 @@
 
-import logging
-
 from docxtpl import RichText
 
 from ghostwriter.modules.reportwriter.base.docx import ExportDocxBase
 from ghostwriter.modules.reportwriter.report.base import ExportReportBase
 
-logger = logging.getLogger(__name__)
-
 
 class ExportReportDocx(ExportDocxBase, ExportReportBase):
     def __init__(self, object, **kwargs):