Merge pull request #779 from CDLUC3/develop

Merge develop to main
CDLUC3 · Oct 31, 2024 · b8e72bb · b8e72bb
2 parents 1d9f7b8 + 7c469ec
commit b8e72bb
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/ezidapp/management/commands/proc-cleanup-async-queues_v2.py b/ezidapp/management/commands/proc-cleanup-async-queues_v2.py
@@ -126,6 +126,7 @@ def run(self):
 
             # iterate over query set to check each identifier status
             for refId in refIdsQS:
+                last_id = refId.pk
 
                 # set status for each handle system
                 identifierStatus = {
@@ -167,7 +168,6 @@ def run(self):
                         "Delete identifier: " + refId.identifier + " from refIdentifier table.")
                     self.deleteRecord(self.refIdentifier, refId.pk, record_type='refId', identifier=refId.identifier)
 
-            last_id = refId.pk
             if len(refIdsQS) < BATCH_SIZE:
                 if updated_from is not None or updated_to is not None:
                     log.info(f"Finished - Checking ref Ids: {time_range_str}")

diff --git a/impl/ui.py b/impl/ui.py
@@ -10,7 +10,7 @@
 
 import django.conf
 import django.contrib.messages
-import django.core.mail
+from django.core.mail import EmailMessage
 import django.http
 import django.template
 import django.template.loader
@@ -90,7 +90,14 @@ def contact(request):
                 else:
                     message += "Newsletter option NOT checked."
             try:
-                django.core.mail.send_mail(title, message, P['email'], emails)
+                email = EmailMessage(
+                    subject=title,
+                    body=message,
+                    from_email=django.conf.settings.SERVER_EMAIL,
+                    to=emails,
+                    reply_to=[P['email']],
+                )
+                email.send(fail_silently=False)
                 # 'extra_tags' used for recording a Google Analytics event
                 django.contrib.messages.add_message(
                     request,