no change, just nicer php

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

diff --git a/PLC/Methods/DeleteNodeTag.py b/PLC/Methods/DeleteNodeTag.py
index 019670c..7bc529a 100644 (file)
--- a/PLC/Methods/DeleteNodeTag.py
+++ b/PLC/Methods/DeleteNodeTag.py
@@ -12,8 +12,6 @@ from PLC.Nodes import Node, Nodes
 from PLC.TagTypes import TagType, TagTypes
 from PLC.NodeTags import NodeTag, NodeTags
 
-from PLC.AuthorizeHelpers import AuthorizeHelpers
-
 class DeleteNodeTag(Method):
     """
     Deletes the specified node tag
@@ -37,7 +35,7 @@ class DeleteNodeTag(Method):
     def call(self, auth, node_tag_id):
         node_tags = NodeTags(self.api, [node_tag_id])
         if not node_tags:
-            raise PLCInvalidArgument, "No such node tag %r"%node_tag_id
+            raise PLCInvalidArgument("No such node tag %r"%node_tag_id)
         node_tag = node_tags[0]
 
         tag_type_id = node_tag['tag_type_id']
@@ -45,18 +43,11 @@ class DeleteNodeTag(Method):
 
         nodes = Nodes (self.api, node_tag['node_id'])
         if not nodes:
-            raise PLCInvalidArgument, "No such node %d"%node_tag['node_id']
+            raise PLCInvalidArgument("No such node %d"%node_tag['node_id'])
         node=nodes[0]
 
         # check authorizations
-        if 'admin' in self.caller['roles']:
-            pass
-        elif not AuthorizeHelpers.caller_may_access_tag_type (self.api, self.caller, tag_type):
-            raise PLCPermissionDenied, "%s, forbidden tag %s"%(self.name,tag_type['tagname'])
-        elif AuthorizeHelpers.node_belongs_to_person (self.api, node, self.caller):
-            pass
-        else:
-            raise PLCPermissionDenied, "%s: you must belong in the same site as subject node"%self.name
+        node.caller_may_write_tag(self.api,self.caller,tag_type)
 
         node_tag.delete()
         self.object_ids = [node_tag['node_tag_id']]