svn keywords

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

diff --git a/PLC/Methods/UpdateNodeTag.py b/PLC/Methods/UpdateNodeTag.py
index 55857b2..4750556 100644 (file)
--- a/PLC/Methods/UpdateNodeTag.py
+++ b/PLC/Methods/UpdateNodeTag.py
@@ -1,3 +1,5 @@
+# $Id$
+# $URL$
 #
 # Thierry Parmentelat - INRIA
 #
@@ -9,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):
     """
@@ -42,13 +42,13 @@ class UpdateNodeTag(Method):
             raise PLCInvalidArgument, "No such node tag %r"%node_tag_id
         node_tag = node_tags[0]
 
-        ### reproducing a check from UpdateSliceAttribute, looks dumb though
+        ### reproducing a check from UpdateSliceTag, looks dumb though
         nodes = Nodes(self.api, [node_tag['node_id']])
         if not nodes:
             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']:
@@ -60,7 +60,7 @@ class UpdateNodeTag(Method):
            if self.caller['person_id'] not in site['person_ids']:
                raise PLCPermissionDenied, "Not a member of the hosting site %s"%site['abbreviated_site']
            
-           required_min_role = node_tag_type ['min_role_id']
+           required_min_role = tag_type ['min_role_id']
            if required_min_role is not None and \
                    min(self.caller['role_ids']) > required_min_role:
                raise PLCPermissionDenied, "Not allowed to modify the specified node tag, requires role %d",required_min_role