git://git.onelab.eu / myslice.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 1592ab3)
Various improvements
authorYasin <mohammed-yasin.rahman@lip6.fr>
Fri, 23 Jan 2015 16:15:26 +0000 (17:15 +0100)
committerYasin <mohammed-yasin.rahman@lip6.fr>
Fri, 23 Jan 2015 16:15:26 +0000 (17:15 +0100)
portal/actions.py patch | blob | history
portal/templates/base.html patch | blob | history
portal/templates/onelab/onelab_widget-topmenu.html patch | blob | history

diff --git a/portal/actions.py b/portal/actions.py
index 8965a9f..c80ba65 100644 (file)
--- a/portal/actions.py
+++ b/portal/actions.py
@@ -80,30 +80,38 @@ 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_admin_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_admin_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_admin_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_admin_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 decc1b3..4e2c506 100644 (file)
--- a/portal/templates/base.html
+++ b/portal/templates/base.html
@@ -97,6 +97,9 @@ $(document).ready(function() {
 </script>
 </head>
 <body ng-app="ManifoldApp">
+<div class="row">
+{% widget '_widget-message.html' %}
+</div>
 {% 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 10fbbe1..668c3d3 100644 (file)
--- a/portal/templates/onelab/onelab_widget-topmenu.html
+++ b/portal/templates/onelab/onelab_widget-topmenu.html
@@ -44,9 +44,6 @@
 </div>
 </div>
 
-<div class="row">
-{% widget '_widget-message.html' %}
-</div>
 <script>
        $(document).ready(function() {
                $('li.slices').mouseenter(function() {
myslice (django)