svn keywords

[plcapi.git] / PLC / Methods / UpdateNodeTag.py

diff --git a/PLC/Methods/UpdateNodeTag.py b/PLC/Methods/UpdateNodeTag.py
index c80bd9c..4750556 100644 (file)
--- a/PLC/Methods/UpdateNodeTag.py
+++ b/PLC/Methods/UpdateNodeTag.py
@@ -1,4 +1,5 @@
 # $Id$
+# $URL$
 #
 # Thierry Parmentelat - INRIA
 #
@@ -10,11 +11,9 @@ from PLC.Method import Method
 from PLC.Parameter import Parameter, Mixed
 from PLC.Auth import Auth
 
-from PLC.NodeTags import NodeTag, NodeTags
-from PLC.Nodes import Node, Nodes
-
-from PLC.Nodes import Nodes
 from PLC.Sites import Sites
+from PLC.Nodes import Node, Nodes
+from PLC.NodeTags import NodeTag, NodeTags
 
 class UpdateNodeTag(Method):
     """
@@ -30,7 +29,7 @@ class UpdateNodeTag(Method):
     accepts = [
         Auth(),
         NodeTag.fields['node_tag_id'],
-        NodeTag.fields['tagvalue']
+        NodeTag.fields['value']
         ]
 
     returns = Parameter(int, '1 if successful')
@@ -49,7 +48,7 @@ class UpdateNodeTag(Method):
             raise PLCInvalidArgument, "No such node %r"%node_tag['node_id']
         node = nodes[0]
 
-        assert node_tag['node_tag_id'] in node['tag_ids']
+        assert node_tag['node_tag_id'] in node['node_tag_ids']
 
        # check permission : it not admin, is the user affiliated with the right site
        if 'admin' not in self.caller['roles']:
@@ -66,7 +65,7 @@ class UpdateNodeTag(Method):
                    min(self.caller['role_ids']) > required_min_role:
                raise PLCPermissionDenied, "Not allowed to modify the specified node tag, requires role %d",required_min_role
 
-        node_tag['tagvalue'] = value
+        node_tag['value'] = value
         node_tag.sync()
 
        self.object_ids = [node_tag['node_tag_id']]