Hotfix email domain name (#120)

ScilifelabDataCentre · Dec 8, 2023 · d2cf444 · d2cf444
1 parent 3425516
commit d2cf444
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 6 deletions.
diff --git a/common/models.py b/common/models.py
@@ -5,6 +5,8 @@
 from django.template.loader import render_to_string
 from django.utils.html import strip_tags
 
+from studio.settings import DOMAIN
+
 
 class UserProfile(models.Model):
     user = models.OneToOneField(User, on_delete=models.CASCADE)
@@ -35,9 +37,9 @@ def send_verification_email(self):
         send_mail(
             "Verify your email address on SciLifeLab Serve",
             (
-                "You registered an account on SciLifeLab Serve (serve.scilifelab.se).\n"
+                f"You registered an account on SciLifeLab Serve ({DOMAIN}).\n"
                 "Please click this link to verify your email address:"
-                f" https://serve.scilifelab.se/verify/?token={self.token}"
+                f" https://{DOMAIN}/verify/?token={self.token}"
                 "\n\n"
                 "SciLifeLab Serve team"
             ),

diff --git a/fixtures/projects_templates.json b/fixtures/projects_templates.json
@@ -7,6 +7,7 @@
       "template": {
         "apps": {
           "project-netpolicy": {
+            "permission": "private",
             "slug": "netpolicy"
           },
           "project-vol": {
@@ -70,6 +71,7 @@
       "template": {
         "apps": {
           "project-netpolicy": {
+            "permission": "private",
             "slug": "netpolicy"
           },
           "project-vol": {

diff --git a/templates/registration/password_reset_email.html b/templates/registration/password_reset_email.html
@@ -1,11 +1,11 @@
 {% load i18n %}{% autoescape off %}
-{% blocktrans %}Hey, You're receiving this email because you requested a password reset for your user account on SciLifeLab Serve (serve.scilifelab.se).{% endblocktrans %}
 {% load get_setting %}
+{% blocktrans %}Hey, You're receiving this email because you requested a password reset for your user account on SciLifeLab Serve {% endblocktrans %}({% get_setting "DOMAIN" %}).
 
 
 {% trans "Please go to the following page and choose a new password:" %}
 {% block reset_link %}
-{% get_setting "EMAIL_TEMPLATE_PROTOCOL" %}://{{ domain }}{% url 'password_reset_confirm' uidb64=uid token=token %}
+{% get_setting "EMAIL_TEMPLATE_PROTOCOL" %}://{% get_setting "DOMAIN" %}{% url 'password_reset_confirm' uidb64=uid token=token %}
 {% endblock %}
 {% trans "Your username is your email, in case you've forgotten:" %} {{ user.get_username }}
 

diff --git a/templates/registration/verify_email.html b/templates/registration/verify_email.html
@@ -1,3 +1,4 @@
+{% load get_setting %}
 <!DOCTYPE html>
 <html lang="en">
 <head>
@@ -35,9 +36,9 @@
 <body>
     <div class="email-container">
         <h1>Verify your email address on SciLifeLab Serve</h1>
-        <p>You registered an account on SciLifeLab Serve (serve.scilifelab.se).</p>
+        <p>You registered an account on SciLifeLab Serve ({% get_setting 'DOMAIN' %}).</p>
         <p>Please click the button below to verify your email address:</p>
-        <a href="https://serve.scilifelab.se/verify/?token={{ token }}" class="button">Verify Email</a>
+        <a href="https://{% get_setting 'DOMAIN' %}/verify/?token={{ token }}" class="button">Verify Email</a>
         <p>If you did not request this, please ignore this email.</p>
         <p>Regards,</p>
         <p>SciLifeLab Serve team</p>