Emailfix (#145)

Author: srugano

src/hope_country_report/utils/mail.py

@@ -84,6 +84,10 @@ def notify_report_completion(report: "ReportConfiguration") -> int:
     if state.request:
         url = state.request.build_absolute_uri(url)
 
+    docs_url = report.get_documents_url()
+    if state.request:
+        docs_url = state.request.build_absolute_uri(docs_url)
+
     if config.CATCH_ALL_EMAIL:
         recipient_list = [config.CATCH_ALL_EMAIL]
     else:
@@ -101,7 +105,7 @@ def notify_report_completion(report: "ReportConfiguration") -> int:
 
 Report {report.title} has been successfully updated/created.
 
-you can view see/download produced documents at {report.get_documents_url()}
+You can view/download produced documents at {docs_url}
 
 
 Kind regards,
@@ -114,6 +118,7 @@ def notify_report_completion(report: "ReportConfiguration") -> int:
         "report": {
             "title": report.title,
             "url": url,
+            "documents_url": docs_url,
         },
     }
     return message.send()

src/hope_country_report/web/templates/admin/power_query/_celery.html

@@ -28,22 +28,4 @@
             <a class="button" target="_flower" href="{{ flower_address }}/task/{{ original.curr_async_result_id }}">Flower</a>
         {% endif %}
     {% endif %}
-
-
-    {% if user.is_superuser %}
-    <span style="float: right">
-        <a class="button" id="celery-info" href="#">?</a>
-        <div class="popup hidden" id="celery-info-panel">
-            <table>
-                <tr><td>Position</td><td>{{ original.get_celery_queue_position }}</td></tr>
-                <tr><th colspan="2">Tasks</th></tr>
-                <tr><td>pending</td><td>{{ original.celery_queue_status.pending }}</td></tr>
-                <tr><td>canceled</td><td>{{ original.celery_queue_status.canceled }}</td></tr>
-                <tr><th colspan="2">Queue</th></tr>
-                <tr><td>size</td><td>{{ original.celery_queue_status.size }}</td></tr>
-                <tr><td>revoked</td><td>{{ original.celery_queue_status.revoked }}</td></tr>
-            </table>
-        </div>
-    </span>
-    {% endif %}
 </div>