From: Yasin Date: Fri, 23 Jan 2015 16:19:30 +0000 (+0100) Subject: conflict fix X-Git-Tag: myslice-1.3~104 X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=87be70ddfd98c34b6d422368c244343a3b36e497;hp=75100a6b42855f7004db7200e796d2680f1add91;p=myslice.git conflict fix --- diff --git a/portal/actions.py b/portal/actions.py index 64d814aa..2075300d 100644 --- a/portal/actions.py +++ b/portal/actions.py @@ -80,30 +80,37 @@ def authority_check_pis(request, user_email): def authority_add_pis(request, authority_hrn,user_hrn): - - # getting pis of the authority of the user - pis = authority_get_pis (request, authority_hrn) - for pi in pis: - pi_list = pi['pi_users'] + try: + # getting pis of the authority of the user + pis = authority_get_pis (request, authority_hrn) + for pi in pis: + pi_list = pi['pi_users'] - updated_pi_list = pi_list.append(user_hrn) - query = Query.update('authority').filter_by('authority_hrn', '==', authority_hrn).set({'pi_users':pi_list}) - results = execute_query(request,query) - newpis = authority_get_pis (request, authority_hrn) - return newpis + updated_pi_list = pi_list.append(user_hrn) + query = Query.update('authority').filter_by('authority_hrn', '==', authority_hrn).set({'pi_users':pi_list}) + results = execute_query(request,query) + newpis = authority_get_pis (request, authority_hrn) + return newpis + except Exception,e: + print "Exception in actions.py in authority_add_pis %s" % e + return None -def authority_remove_pis(request, authority_hrn,user_hrn): - # getting pis of the authority of the user - pis = authority_get_pis (request, authority_hrn) - for pi in pis: - pi_list = pi['pi_users'] +def authority_remove_pis(request, authority_hrn,user_hrn): + try: + # getting pis of the authority of the user + pis = authority_get_pis (request, authority_hrn) + for pi in pis: + pi_list = pi['pi_users'] - updated_pi_list = pi_list.remove(user_hrn) - query = Query.update('authority').filter_by('authority_hrn', '==', authority_hrn).set({'pi_users':pi_list}) - results = execute_query(request,query) - newpis = authority_get_pis (request, authority_hrn) - return newpis + updated_pi_list = pi_list.remove(user_hrn) + query = Query.update('authority').filter_by('authority_hrn', '==', authority_hrn).set({'pi_users':pi_list}) + results = execute_query(request,query) + newpis = authority_get_pis (request, authority_hrn) + return newpis + except Exception,e: + print "Exception in actions.py in authority_remove_pis %s" % e + return None def authority_get_pi_emails(request, authority_hrn): diff --git a/portal/templates/base.html b/portal/templates/base.html index decc1b38..4e2c5064 100644 --- a/portal/templates/base.html +++ b/portal/templates/base.html @@ -97,6 +97,9 @@ $(document).ready(function() { +

+{% widget '_widget-message.html' %} +

{% block container %} {% block topmenu %} {% widget "_widget-topmenu.html" %} diff --git a/portal/templates/onelab/onelab_widget-topmenu.html b/portal/templates/onelab/onelab_widget-topmenu.html index 10fbbe13..668c3d32 100644 --- a/portal/templates/onelab/onelab_widget-topmenu.html +++ b/portal/templates/onelab/onelab_widget-topmenu.html @@ -44,9 +44,6 @@ -

-{% widget '_widget-message.html' %} -