Split up warnings in email

readux_ingest_ecds/mail.py

@@ -44,9 +44,13 @@ def send_email_on_success(creator=None, manifest=None, warnings=None):
         )
         context["manifest_pid"] = manifest.pid
         context["volume_url"] = manifest.get_volume_url()
-        context["warnings"] = (
+        ingest_warnings = (
             warnings if warnings is not None and len(warnings) > 10 else None
         )
+        context["warnings"] = (
+            ingest_warnings.split("$$$$") if ingest_warnings is not None else None
+        )
+
         html_email = get_template("ingest_ecds_success_email.html").render(context)
         text_email = get_template("ingest_ecds_success_email.txt").render(context)
         if creator is not None:

readux_ingest_ecds/tasks.py

@@ -116,7 +116,7 @@ def add_ocr_task_local(ingest_id, manifest_pid, *args, **kwargs):
     local_ingest = Local.objects.get(pk=ingest_id)
     manifest = Manifest.objects.get(pk=local_ingest.manifest.pk)
     warnings = add_ocr_to_canvases(manifest)
-    local_ingest.warnings = "\n".join(warnings)
+    local_ingest.warnings = "$$$$".join(warnings)
     local_ingest.save()
 
 

readux_ingest_ecds/templates/ingest_ecds_success_email.html

@@ -14,5 +14,9 @@ <h3 style="color: green;">Ingest complete: {{ manifest_pid }}</h3>
 </p>
 {% if warnings is not None %}
   <p>Warnings</p>
-  <p>{{warnings}}</p>
+  <ul>
+    {% for warning in warnings %}
+      <li>{{ warning }}</li>
+    {% endfor %}
+  </ul>
 {% endif %}

readux_ingest_ecds/templates/ingest_ecds_success_email.txt

@@ -8,5 +8,5 @@ Ingest complete: {{ manifest_pid }}
 - Link to volume: {{ volume_url }}
 {% if warnings is not None %}
 - Warnings:
-{{ warnings }}
+{{ warnings|join:"\n" }}
 {% endif %}