From: Yasin Date: Thu, 5 Sep 2013 16:30:06 +0000 (+0200) Subject: FIX: slicerequestview errors X-Git-Tag: myslice-0.2-1~9 X-Git-Url: http://git.onelab.eu/?p=myslice.git;a=commitdiff_plain;h=346133133ce1e95941c9c97b60b866baad731729 FIX: slicerequestview errors --- diff --git a/portal/actions.py b/portal/actions.py index 53d0a784..03a0e93b 100644 --- a/portal/actions.py +++ b/portal/actions.py @@ -6,19 +6,22 @@ import json # Get the list of authorities -def authority_get_pis(authority_hrn): +def authority_get_pis(request, authority_hrn): query = Query.get('authority').filter_by('authority_hrn', '==', authority_hrn).select('pi_users') - results = execute_query(query) - if not results: - raise Exception, "Authority not found: %s" % authority_hrn - result, = results - return result['pi_users'] + results = execute_query(request, query) + # NOTE: temporarily commented. Because results is giving empty list. + # Needs more debugging + #if not results: + # raise Exception, "Authority not found: %s" % authority_hrn + #result, = results + #return result['pi_users'] + return results -def authority_get_pi_emails(authority_hrn): - user_hrns = authority_get_pis(authority_hrn) +def authority_get_pi_emails(request,authority_hrn): + user_hrns = authority_get_pis(request,authority_hrn) query = Query.get('user').filter_by('user_hrn', 'included', user_hrns).select('user_email') - results = execute_query(query) + results = execute_query(request,query) return [result['user_email'] for result in results] diff --git a/portal/slicerequestview.py b/portal/slicerequestview.py index e42619e8..4f332e4a 100644 --- a/portal/slicerequestview.py +++ b/portal/slicerequestview.py @@ -1,5 +1,6 @@ from django.template.loader import render_to_string from django.shortcuts import render +from django.core.mail import send_mail from manifold.core.query import Query from manifold.manifoldapi import execute_query @@ -49,7 +50,7 @@ class SliceRequestView (LoginRequiredAutoLogoutView): cc_myself = form.cleaned_data['cc_myself'] # The recipients are the PI of the authority - recipients = authority_get_pi_emails(authority_hrn) + recipients = authority_get_pi_emails(request,authority_hrn) #recipients = ['yasin.upmc@gmail.com','jordan.auge@lip6.fr'] if cc_myself: recipients.append(email)