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

[myslice.git] / rest / __init__.py

diff --git a/rest/__init__.py b/rest/__init__.py
index 3c4eb5f..1ca3797 100644 (file)
--- a/rest/__init__.py
+++ b/rest/__init__.py
@@ -50,7 +50,7 @@ class ObjectRequest(object):
                 self.fields = ['user_id', 'email', 'password', 'config','status'];
             elif table == "account":
                 # XXX TODO: Multiple key for account = (platform_id, user_id)
-                self.id = None
+                self.id = "platform_id, user_id"
                 self.fields = ['platform_id', 'user_id', 'auth_type', 'config'];
             elif table == "platform":
                 self.id = 'platform'
@@ -141,7 +141,10 @@ class ObjectRequest(object):
             print "query = ",query
         else:
             raise Exception, "Params are required for update"
-        
+
+        if self.id is not None:
+           query.select(self.id)
+       
         return execute_query(self.request, query)
     
     def delete(self):
@@ -150,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):