From d22c36263acb20d9f7a2f80832946c2503499476 Mon Sep 17 00:00:00 2001
From: Yasin <mohammed-yasin.rahman@lip6.fr>
Date: Tue, 29 Jul 2014 12:26:51 +0200
Subject: [PATCH] slice creation updated + support email updated

---
 portal/actions.py                              | 18 +++++++++++-------
 portal/contactview.py                          |  2 +-
 .../templates/onelab/onelab_supportview.html   |  2 +-
 3 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/portal/actions.py b/portal/actions.py
index 75e5d06f..3f830135 100644
--- a/portal/actions.py
+++ b/portal/actions.py
@@ -416,7 +416,12 @@ def create_slice(wsgi_request, request):
     user_hrn = request.get('user_hrn', None)
     user_hrns = list([user_hrn]) if user_hrn else list()
     
-    user_email = request.get
+    user_query  = Query().get('user').select('user_hrn','user_email').filter_by('user_hrn','==',user_hrn)
+    user_details_sfa = execute_admin_query(wsgi_request, user_query)
+    if not user_details_sfa:
+        raise Exception, "User %s doesn't exist, validate user before validating slice" % user_hrn
+    for user in user_details_sfa:
+        user_email = user['user_email']
 
     # XXX We should create a slice with Manifold terminology
     slice_params = {
@@ -432,12 +437,11 @@ def create_slice(wsgi_request, request):
     results = execute_query(wsgi_request, query)
     if not results:
         raise Exception, "Could not create %s. Already exists ?" % slice_params['hrn']
-    ## We do not store the email in pendingslice table. As a result receiver's email is unknown ##
-    ## Need modification in pendingslice table ###
-    #else:
-    #    subject = 'Slice created'
-    #    msg = 'A manager of your institution has validated your slice request. You can now add resources to the slice and start experimenting.'
-    #    send_mail(subject, msg, 'support@onelab.eu',['yasin.upmc@gmail.com'], fail_silently=False)
+    else:
+        clear_user_creds(wsgi_request,user_email)
+        subject = 'Slice created'
+        msg = 'A manager of your institution has validated your slice request. You can now add resources to the slice and start experimenting.'
+        send_mail(subject, msg, 'support@onelab.eu',[user_email], fail_silently=False)
        
     return results
 
diff --git a/portal/contactview.py b/portal/contactview.py
index c41ee74d..482594e3 100644
--- a/portal/contactview.py
+++ b/portal/contactview.py
@@ -35,7 +35,7 @@ class ContactView (FreeAccessView, ThemeView):
             #theme.template_name = 'email_support.txt'
             #recipients = render_to_string(theme.template, form.cleaned_data)
             #recipients = subject.replace('\n', '')
-            recipients = ['support@myslice.info']
+            recipients = ['support@onelab.eu']
             if cc_myself:
                 recipients.append(email)
             #recipients = ['support@myslice.info']
diff --git a/portal/templates/onelab/onelab_supportview.html b/portal/templates/onelab/onelab_supportview.html
index e33127cd..eb2a8dea 100644
--- a/portal/templates/onelab/onelab_supportview.html
+++ b/portal/templates/onelab/onelab_supportview.html
@@ -110,7 +110,7 @@
 	  		<h2>Contact Us</h2>
 		
 			<h3>Mailing List</h3>
-			<p>You can subscribe to our mailing list by sending a request to: <b>support</b> AT <b>myslice</b> DOT <b>info</b></p>
+			<p>You can subscribe to our mailing list by sending a request to: <b>support</b> (AT) <b>onelab</b> (DOT) <b>eu</b></p>
 			<p>Also you can adress any issues in the same email address.</p>
 			
 			<h3>Mailing Address</h3>
-- 
2.43.0