Merge branch 'onelab' of ssh://git.onelab.eu/git/myslice into onelab

diff --git a/portal/templates/slice-tab-users-view.html b/portal/templates/slice-tab-users-view.html
index e1b0618..fb49615 100644 (file)
--- a/portal/templates/slice-tab-users-view.html
+++ b/portal/templates/slice-tab-users-view.html
@@ -31,6 +31,9 @@
                        <th>Enabled</th>
                        </tr>
                </table>
+
+                <!-- XXX TODO: for the moment only PIs have access to Update but users that have slice credentials should also have access to that -->
+
                                {% if 'is_pi'  in pi %}
                                <button id="addusers" type="button" class="btn btn-default"><span class="glyphicon glyphicon-ok"></span> Update users</button>
                                {%endif%}
@@ -93,15 +96,15 @@
                 });
            
                }); // post rest/user
-
                $('button#addusers').click(function() {
                 $.post("/update/slice/",{'filters':{'slice_hrn':'{{slice}}'},'params':{'users':slice_users}}, function(data) {
                     console.log(data);
                        if(data.success){
                        // TODO: highlight row after success
                        //$('tr[id="'+record_id+'"]').highlight();
+                       mysliceAlert("Success: slice updated",'success');
                        }else{
-                       alert("Rest Error for: "+data.error);
+                       mysliceAlert("Rest Error for: "+data.error,'warning');
                        }
                 }); // post update slice
             

diff --git a/rest/__init__.py b/rest/__init__.py
index faef22e..1ca3797 100644 (file)
--- a/rest/__init__.py
+++ b/rest/__init__.py
@@ -153,7 +153,7 @@ class ObjectRequest(object):
         if self.filters :
             query.set(self.filters)
         else:
-            raise Exception, "Filters are required for update"
+            raise Exception, "Filters are required for delete"
         return execute_query(self.request, query)
     
     def json(self):