Merge pull request #2060 from codalab/email_updates

Email - Added CONTACT_EMAIL

Author: ObadaS

.env_sample

@@ -45,6 +45,8 @@ SELENIUM_HOSTNAME=selenium
 #DEFAULT_FROM_EMAIL="Codabench <[email protected]>"
 #[email protected]
 
+# Contact Email
+[email protected]
 
 # -----------------------------------------------------------------------------
 # Storage

src/apps/api/views/competitions.py

@@ -739,12 +739,12 @@ def rerun_submissions(self, request, pk):
                 # Codabemch public queue
                 if comp.queue is None:
                     can_re_run_submissions = False
-                    error_message = f"You cannot rerun more than {settings.RERUN_SUBMISSION_LIMIT} submissions on Codabench public queue! Contact us on `[email protected]` to request a rerun."
+                    error_message = f"You cannot rerun more than {settings.RERUN_SUBMISSION_LIMIT} submissions on Codabench public queue! Contact us on `{settings.CONTACT_EMAIL}` to request a rerun."
 
                 # Other queue where user is not owner and not organizer
                 elif request.user != comp.queue.owner and request.user not in comp.queue.organizers.all():
                     can_re_run_submissions = False
-                    error_message = f"You cannot rerun more than {settings.RERUN_SUBMISSION_LIMIT} submissions on a queue which is not yours! Contact us on `[email protected]` to request a rerun."
+                    error_message = f"You cannot rerun more than {settings.RERUN_SUBMISSION_LIMIT} submissions on a queue which is not yours! Contact us on `{settings.CONTACT_EMAIL}` to request a rerun."
 
                 # User can rerun submissions where he is owner or organizer
                 else:

src/apps/pages/views.py

@@ -5,6 +5,7 @@
 from competitions.models import Submission
 from announcements.models import Announcement, NewsPost
 
+from django.conf import settings
 from django.shortcuts import render
 from utils.data import pretty_bytes
 
@@ -20,6 +21,7 @@ def get_context_data(self, *args, **kwargs):
 
         news_posts = NewsPost.objects.all().order_by('-id')
         context['news_posts'] = news_posts
+        context['CONTACT_EMAIL'] = settings.CONTACT_EMAIL
 
         return context
 

src/apps/profiles/views.py

@@ -347,7 +347,7 @@ class CustomPasswordResetView(auth_views.PasswordResetView):
        We have to use app:view_name syntax in templates like " {% url 'accounts:password_reset_confirm'%} "
        Therefore we need to tell this view to find the right success_url with that syntax or django won't be
        able to find the view.
-    3. from_email: We want to set the from_email to [email protected] - may eventually put in .env file.
+    3. from_email: We want to use SERVER_EMAIL already set in the .env
     #  The other commented sections are the defaults for other attributes in auth_views.PasswordResetView.
        They are in here in case someone wants to customize in the future. All attributes show up in the order
        shown in the docs.

src/settings/base.py

@@ -452,6 +452,7 @@ def setup_celery_logging(**kwargs):
 DEFAULT_FROM_EMAIL = os.environ.get('DEFAULT_FROM_EMAIL', 'Codabench <[email protected]>')
 SERVER_EMAIL = os.environ.get('SERVER_EMAIL', '[email protected]')
 
+CONTACT_EMAIL = os.environ.get('CONTACT_EMAIL', '[email protected]')
 
 # Django-Su (User impersonation)
 SU_LOGIN_CALLBACK = 'profiles.admin.su_login_callback'

src/templates/pages/home.html

@@ -81,7 +81,7 @@ <h3 class="ui icon header">
                         Contribute
                     </h3>
                     <div>
-                        <p>Interested in joining the development team? Join us on <a href="https://github.com/codalab/codabench">Github</a> or <a href="mailto:[email protected]">contact us</a> directly.</p>
+                        <p>Interested in joining the development team? Join us on <a href="https://github.com/codalab/codabench">Github</a> or <a href="mailto:{{CONTACT_EMAIL}}">contact us</a> directly.</p>
                     </div>
                 </div>
             </div>