From: Yasin Date: Mon, 14 Apr 2014 13:04:53 +0000 (+0200) Subject: Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab X-Git-Tag: myslice-1.1~134^2~1 X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=9d5053bbeb2b6e384783e165581450be9c7f0073;hp=448eb28000efc949e8150330e038bb6c806ccabf;p=myslice.git Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab --- diff --git a/manifoldapi/manifoldapi.py b/manifoldapi/manifoldapi.py index b1a1a0cc..b105bf30 100644 --- a/manifoldapi/manifoldapi.py +++ b/manifoldapi/manifoldapi.py @@ -152,7 +152,9 @@ def _execute_query(request, query, manifold_api_session_auth): def execute_query(request, query): if not 'manifold' in request.session or not 'auth' in request.session['manifold']: request.session.flush() - raise Exception, "User not authenticated" + #raise Exception, "User not authenticated" + host = request.get_host() + return redirect(host) manifold_api_session_auth = request.session['manifold']['auth'] return _execute_query(request, query, manifold_api_session_auth) diff --git a/plugins/testbeds/static/js/testbeds.js b/plugins/testbeds/static/js/testbeds.js index f26602e6..b9771270 100644 --- a/plugins/testbeds/static/js/testbeds.js +++ b/plugins/testbeds/static/js/testbeds.js @@ -135,7 +135,7 @@ value = this.dataset['platform']; // handle the hrn that include . in their name (has to be in sync with the data from SFA) - value = value.replace(/\./g,"\\."); + //value = value.replace(/\./g,"\\."); key = "network_hrn"; op = "included"; return $(this).hasClass('active') ? self._addFilter(key, op, value) : self._removeFilter(key, op, value); diff --git a/portal/actions.py b/portal/actions.py index 7cda3a97..c3695e36 100644 --- a/portal/actions.py +++ b/portal/actions.py @@ -23,6 +23,7 @@ theme = ThemeView() def authority_get_pis(request, authority_hrn): query = Query.get('authority').filter_by('authority_hrn', '==', authority_hrn).select('pi_users') results = execute_admin_query(request, query) + print "authority_get_pis = %s" % results # NOTE: temporarily commented. Because results is giving empty list. # Needs more debugging #if not results: @@ -33,6 +34,8 @@ def authority_get_pis(request, authority_hrn): def authority_get_pi_emails(request, authority_hrn): pi_users = authority_get_pis(request,authority_hrn) + print "pi_users = %s" % pi_users + if any(d['pi_users'] == None for d in pi_users): theme.template_name = 'email_default_recipients.txt' default_email = render_to_string(theme.template, request) @@ -404,7 +407,7 @@ def create_pending_slice(wsgi_request, request, email): try: # Send an email: the recipients are the PI of the authority recipients = authority_get_pi_emails(wsgi_request, request['authority_hrn']) - + theme.template_name = 'slice_request_email.txt' text_content = render_to_string(theme.template, request) @@ -416,8 +419,7 @@ def create_pending_slice(wsgi_request, request, email): subject = subject.replace('\n', '') sender = email - msg = EmailMultiAlternatives(subject, text_content, sender, [recipients]) - print msg + msg = EmailMultiAlternatives(subject, text_content, sender, recipients) msg.attach_alternative(html_content, "text/html") msg.send() except Exception, e: @@ -595,8 +597,10 @@ def create_pending_user(wsgi_request, request, user_detail): sender = render_to_string(theme.template, request) sender = sender.replace('\n', '') - msg = EmailMultiAlternatives(subject, text_content, sender, [recipients]) + msg = EmailMultiAlternatives(subject, text_content, sender, recipients) msg.attach_alternative(html_content, "text/html") msg.send() except Exception, e: print "Failed to send email, please check the mail templates and the SMTP configuration of your server" + import traceback + traceback.print_exc() diff --git a/portal/contactview.py b/portal/contactview.py index 95fb44e8..44c151c4 100644 --- a/portal/contactview.py +++ b/portal/contactview.py @@ -50,7 +50,7 @@ class ContactView (FreeAccessView, ThemeView): else: sender = email - msg = EmailMultiAlternatives(subject, text_content, sender, [recipients]) + msg = EmailMultiAlternatives(subject, text_content, sender, recipients) msg.attach_alternative(html_content, "text/html") msg.send() except Exception, e: diff --git a/portal/joinview.py b/portal/joinview.py index a2b8b7d9..c128db3b 100644 --- a/portal/joinview.py +++ b/portal/joinview.py @@ -205,7 +205,7 @@ class JoinView (FreeAccessView, ThemeView): sender = render_to_string(theme.template, ctx) sender = sender.replace('\n', '') - msg = EmailMultiAlternatives(subject, text_content, sender, [recipients]) + msg = EmailMultiAlternatives(subject, text_content, sender, recipients) msg.attach_alternative(html_content, "text/html") msg.send() diff --git a/portal/registrationview.py b/portal/registrationview.py index a4b5fd5c..ab09c9f1 100644 --- a/portal/registrationview.py +++ b/portal/registrationview.py @@ -88,8 +88,11 @@ class RegistrationView (FreeAccessView, ThemeView): if user_detail['email'] == user_request['email']: errors.append('Email already registered in Manifold. Please provide a new email address.') # Does the user exist in sfa? [query is very slow!!] - user_query = Query().get('user').select('user_hrn','user_email') + #user_query = Query().get('user').select('user_hrn','user_email') + # XXX Test based on the user_hrn is quick + user_query = Query().get('user').select('user_hrn','user_email').filter_by('user_hrn','==',user_request['user_hrn']) user_details_sfa = execute_admin_query(wsgi_request, user_query) + for user in user_details_sfa: if user['user_email'] == user_request['email']: errors.append('Email already registered in SFA registry. Please use another email.') diff --git a/portal/sliceresourceview.py b/portal/sliceresourceview.py index fd9b3f88..b02b0cac 100644 --- a/portal/sliceresourceview.py +++ b/portal/sliceresourceview.py @@ -50,7 +50,7 @@ class SliceResourceView (LoginRequiredView, ThemeView): 'resource.hostname', 'resource.type', 'resource.network_hrn', 'lease.urn', - 'user.user_hrn', + #'user.user_hrn', #'application.measurement_point.counter' ) # for internal use in the querytable plugin; diff --git a/portal/static/img/testbeds/wilab2.ilabt.iminds.be.png b/portal/static/img/testbeds/wilab2.ilabt.iminds.be.png new file mode 100644 index 00000000..4ce8035c Binary files /dev/null and b/portal/static/img/testbeds/wilab2.ilabt.iminds.be.png differ diff --git a/portal/templates/slice-resource-view.html b/portal/templates/slice-resource-view.html index 33d0c085..556db48f 100644 --- a/portal/templates/slice-resource-view.html +++ b/portal/templates/slice-resource-view.html @@ -85,7 +85,7 @@ {{map_resources}}