From 8daba73d1252ef12cf9b2b4390dffcb94f80055a Mon Sep 17 00:00:00 2001
From: Yasin <mohammed-yasin.rahman@lip6.fr>
Date: Mon, 14 Apr 2014 11:47:59 +0200
Subject: [PATCH] Email: Dynamically add domain of the portal in email

---
 portal/registrationview.py               | 6 ++++++
 portal/templates/user_request_email.html | 7 ++++---
 portal/templates/user_request_email.txt  | 7 ++++---
 3 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/portal/registrationview.py b/portal/registrationview.py
index 396d357b..a4b5fd5c 100644
--- a/portal/registrationview.py
+++ b/portal/registrationview.py
@@ -6,6 +6,7 @@ from django.views.generic       import View
 from django.template.loader     import render_to_string
 from django.shortcuts           import render
 from django.contrib.auth        import get_user_model
+from django.contrib.sites.models import Site
 
 from unfold.page                import Page
 from unfold.loginrequired       import FreeAccessView
@@ -49,6 +50,10 @@ class RegistrationView (FreeAccessView, ThemeView):
 
         if method == 'POST':
             # The form has been submitted
+            
+            # get the domain url
+            current_site = Site.objects.get_current()
+            current_site = current_site.domain
 
             user_request = {
                 'first_name'    : wsgi_request.POST.get('firstname',     ''),
@@ -56,6 +61,7 @@ class RegistrationView (FreeAccessView, ThemeView):
                 'authority_hrn' : wsgi_request.POST.get('authority_hrn', ''),
                 'email'         : wsgi_request.POST.get('email',         '').lower(),
                 'password'      : wsgi_request.POST.get('password',      ''),
+                'current_site'  : current_site
             }
 
             # Construct user_hrn from email (XXX Should use common code)
diff --git a/portal/templates/user_request_email.html b/portal/templates/user_request_email.html
index e8f2b389..b33d32fc 100644
--- a/portal/templates/user_request_email.html
+++ b/portal/templates/user_request_email.html
@@ -2,9 +2,10 @@
 <br>
 <h1>NEW USER REQUEST</h1>
 <br>
-<b>First Name   :</b> {{first_name}}
-<b>Last Name    :</b> {{last_name}}
+<b>First name   :</b> {{first_name}}
+<b>Last name    :</b> {{last_name}}
 <b>Authority hrn:</b> {{authority_hrn}}
 <b>Public key   :</b> {{public_key}}
 <b>Email        :</b> {{email}}
-<b>User Hrn     :</b> {{user_hrn}}
+<b>User hrn     :</b> {{user_hrn}}
+<b>Portal url	:</b> {{ current_site }}
diff --git a/portal/templates/user_request_email.txt b/portal/templates/user_request_email.txt
index d38fd314..cce80cb3 100644
--- a/portal/templates/user_request_email.txt
+++ b/portal/templates/user_request_email.txt
@@ -1,8 +1,9 @@
 NEW USER REQUEST
 
-First Name   : {{first_name}}
-Last Name    : {{last_name}} 
+First name   : {{first_name}}
+Last name    : {{last_name}} 
 Authority hrn: {{authority_hrn}}
 Public key   : {{public_key}}
 Email        : {{email}}
-User Hrn     : {{user_hrn}}
+User hrn     : {{user_hrn}}
+Portal url   : {{ current_site }}
-- 
2.43.0