From c61fb615ec4fdfac9405c582282f75e81095b9e0 Mon Sep 17 00:00:00 2001
From: didayolo <adrien.pavao@gmail.com>
Date: Thu, 16 Jan 2025 15:57:46 +0100
Subject: [PATCH 1/2] Fix URLs in user deletion email

---
 src/apps/profiles/views.py                                | 4 +++-
 .../profiles/emails/template_delete_account_notice.html   | 8 ++++----
 .../profiles/emails/template_delete_account_notice.txt    | 8 ++++----
 3 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/src/apps/profiles/views.py b/src/apps/profiles/views.py
index 938a4ef3e..84196a198 100644
--- a/src/apps/profiles/views.py
+++ b/src/apps/profiles/views.py
@@ -153,7 +153,9 @@ def send_user_deletion_notice_to_admin(user):
         'data_groups': data_groups,
         'tasks': tasks,
         'queues': queues,
-        'posts': posts
+        'posts': posts,
+        'protocol': 'https' if request.is_secure() else 'http',
+        'domain': get_current_site(request).domain
     }
     codalab_send_mail(
         context_data=context,
diff --git a/src/templates/profiles/emails/template_delete_account_notice.html b/src/templates/profiles/emails/template_delete_account_notice.html
index 48ff7dcb8..4bc0e196c 100644
--- a/src/templates/profiles/emails/template_delete_account_notice.html
+++ b/src/templates/profiles/emails/template_delete_account_notice.html
@@ -36,7 +36,7 @@ <h4>Organizations the user is part of:</h4>
     <ul>
         {% for organization in organizations.all %}
             <li>
-                <a class="item" href="{% url 'profiles:organization_profile' pk=organization.id %}">
+                <a class="item" href="{{ protocol }}://{{ domain }}{% url 'profiles:organization_profile' pk=organization.id %}">
                     {{ organization }}
                 </a>
             </li>
@@ -47,7 +47,7 @@ <h4>Competitions the user is the owner:</h4>
     <ul>
         {% for competition in competitions_organizer.all %}
             <li>
-                <a class="item" href="{% url 'competitions:detail' pk=competition.pk %}">
+                <a class="item" href="{{ protocol }}://{{ domain }}{% url 'competitions:detail' pk=competition.pk %}">
                     {{ competition }}
                 </a>
             </li>
@@ -58,7 +58,7 @@ <h4>Competitions the user participated in:</h4>
     <ul>
         {% for competition in competitions_participation.all %}
         <li>
-            <a class="item" href="{% url 'competitions:detail' pk=competition.pk %}">
+            <a class="item" href="{{ protocol }}://{{ domain }}{% url 'competitions:detail' pk=competition.pk %}">
                 {{ competition }}
             </a>
         </li>
@@ -94,7 +94,7 @@ <h4>Tasks created by the user</h4>
     <ul>
         {% for task in tasks.all %}
         <li>
-            <a class="item" href="{% url 'tasks:detail' pk=task.pk %}">
+            <a class="item" href="{{ protocol }}://{{ domain }}{% url 'tasks:detail' pk=task.pk %}">
                 {{ task }}
             </a>
         </li>
diff --git a/src/templates/profiles/emails/template_delete_account_notice.txt b/src/templates/profiles/emails/template_delete_account_notice.txt
index 48ff7dcb8..4bc0e196c 100644
--- a/src/templates/profiles/emails/template_delete_account_notice.txt
+++ b/src/templates/profiles/emails/template_delete_account_notice.txt
@@ -36,7 +36,7 @@
     <ul>
         {% for organization in organizations.all %}
             <li>
-                <a class="item" href="{% url 'profiles:organization_profile' pk=organization.id %}">
+                <a class="item" href="{{ protocol }}://{{ domain }}{% url 'profiles:organization_profile' pk=organization.id %}">
                     {{ organization }}
                 </a>
             </li>
@@ -47,7 +47,7 @@
     <ul>
         {% for competition in competitions_organizer.all %}
             <li>
-                <a class="item" href="{% url 'competitions:detail' pk=competition.pk %}">
+                <a class="item" href="{{ protocol }}://{{ domain }}{% url 'competitions:detail' pk=competition.pk %}">
                     {{ competition }}
                 </a>
             </li>
@@ -58,7 +58,7 @@
     <ul>
         {% for competition in competitions_participation.all %}
         <li>
-            <a class="item" href="{% url 'competitions:detail' pk=competition.pk %}">
+            <a class="item" href="{{ protocol }}://{{ domain }}{% url 'competitions:detail' pk=competition.pk %}">
                 {{ competition }}
             </a>
         </li>
@@ -94,7 +94,7 @@
     <ul>
         {% for task in tasks.all %}
         <li>
-            <a class="item" href="{% url 'tasks:detail' pk=task.pk %}">
+            <a class="item" href="{{ protocol }}://{{ domain }}{% url 'tasks:detail' pk=task.pk %}">
                 {{ task }}
             </a>
         </li>

From 6d23a9454c1b74b1bc9d3ee07d209b56207bfd2f Mon Sep 17 00:00:00 2001
From: didayolo <adrien.pavao@gmail.com>
Date: Thu, 16 Jan 2025 16:22:50 +0100
Subject: [PATCH 2/2] Fix domain

---
 src/apps/profiles/views.py                                | 3 +--
 .../profiles/emails/template_delete_account_notice.html   | 8 ++++----
 .../profiles/emails/template_delete_account_notice.txt    | 8 ++++----
 3 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/src/apps/profiles/views.py b/src/apps/profiles/views.py
index 84196a198..10262c699 100644
--- a/src/apps/profiles/views.py
+++ b/src/apps/profiles/views.py
@@ -154,8 +154,7 @@ def send_user_deletion_notice_to_admin(user):
         'tasks': tasks,
         'queues': queues,
         'posts': posts,
-        'protocol': 'https' if request.is_secure() else 'http',
-        'domain': get_current_site(request).domain
+        'domain': settings.DOMAIN_NAME
     }
     codalab_send_mail(
         context_data=context,
diff --git a/src/templates/profiles/emails/template_delete_account_notice.html b/src/templates/profiles/emails/template_delete_account_notice.html
index 4bc0e196c..e71db8ac4 100644
--- a/src/templates/profiles/emails/template_delete_account_notice.html
+++ b/src/templates/profiles/emails/template_delete_account_notice.html
@@ -36,7 +36,7 @@ <h4>Organizations the user is part of:</h4>
     <ul>
         {% for organization in organizations.all %}
             <li>
-                <a class="item" href="{{ protocol }}://{{ domain }}{% url 'profiles:organization_profile' pk=organization.id %}">
+                <a class="item" href="{{ domain }}{% url 'profiles:organization_profile' pk=organization.id %}">
                     {{ organization }}
                 </a>
             </li>
@@ -47,7 +47,7 @@ <h4>Competitions the user is the owner:</h4>
     <ul>
         {% for competition in competitions_organizer.all %}
             <li>
-                <a class="item" href="{{ protocol }}://{{ domain }}{% url 'competitions:detail' pk=competition.pk %}">
+                <a class="item" href="{{ domain }}{% url 'competitions:detail' pk=competition.pk %}">
                     {{ competition }}
                 </a>
             </li>
@@ -58,7 +58,7 @@ <h4>Competitions the user participated in:</h4>
     <ul>
         {% for competition in competitions_participation.all %}
         <li>
-            <a class="item" href="{{ protocol }}://{{ domain }}{% url 'competitions:detail' pk=competition.pk %}">
+            <a class="item" href="{{ domain }}{% url 'competitions:detail' pk=competition.pk %}">
                 {{ competition }}
             </a>
         </li>
@@ -94,7 +94,7 @@ <h4>Tasks created by the user</h4>
     <ul>
         {% for task in tasks.all %}
         <li>
-            <a class="item" href="{{ protocol }}://{{ domain }}{% url 'tasks:detail' pk=task.pk %}">
+            <a class="item" href="{{ domain }}{% url 'tasks:detail' pk=task.pk %}">
                 {{ task }}
             </a>
         </li>
diff --git a/src/templates/profiles/emails/template_delete_account_notice.txt b/src/templates/profiles/emails/template_delete_account_notice.txt
index 4bc0e196c..e71db8ac4 100644
--- a/src/templates/profiles/emails/template_delete_account_notice.txt
+++ b/src/templates/profiles/emails/template_delete_account_notice.txt
@@ -36,7 +36,7 @@
     <ul>
         {% for organization in organizations.all %}
             <li>
-                <a class="item" href="{{ protocol }}://{{ domain }}{% url 'profiles:organization_profile' pk=organization.id %}">
+                <a class="item" href="{{ domain }}{% url 'profiles:organization_profile' pk=organization.id %}">
                     {{ organization }}
                 </a>
             </li>
@@ -47,7 +47,7 @@
     <ul>
         {% for competition in competitions_organizer.all %}
             <li>
-                <a class="item" href="{{ protocol }}://{{ domain }}{% url 'competitions:detail' pk=competition.pk %}">
+                <a class="item" href="{{ domain }}{% url 'competitions:detail' pk=competition.pk %}">
                     {{ competition }}
                 </a>
             </li>
@@ -58,7 +58,7 @@
     <ul>
         {% for competition in competitions_participation.all %}
         <li>
-            <a class="item" href="{{ protocol }}://{{ domain }}{% url 'competitions:detail' pk=competition.pk %}">
+            <a class="item" href="{{ domain }}{% url 'competitions:detail' pk=competition.pk %}">
                 {{ competition }}
             </a>
         </li>
@@ -94,7 +94,7 @@
     <ul>
         {% for task in tasks.all %}
         <li>
-            <a class="item" href="{{ protocol }}://{{ domain }}{% url 'tasks:detail' pk=task.pk %}">
+            <a class="item" href="{{ domain }}{% url 'tasks:detail' pk=task.pk %}">
                 {{ task }}
             </a>
         </li>