fix packaging for f37 (4/n)

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

diff --git a/PLC/Methods/AddSiteTag.py b/PLC/Methods/AddSiteTag.py
index 2069698..0e7561b 100644 (file)
--- a/PLC/Methods/AddSiteTag.py
+++ b/PLC/Methods/AddSiteTag.py
@@ -11,6 +11,7 @@ from PLC.Nodes import Nodes
 from PLC.TagTypes import TagType, TagTypes
 from PLC.SiteTags import SiteTag, SiteTags
 
+# need to import so the core classes get decorated with caller_may_write_tag
 from PLC.AuthorizeHelpers import AuthorizeHelpers
 
 class AddSiteTag(Method):
@@ -42,12 +43,12 @@ class AddSiteTag(Method):
     def call(self, auth, site_id, tag_type_id_or_name, value):
         sites = Sites(self.api, [site_id])
         if not sites:
-            raise PLCInvalidArgument, "No such site %r"%site_id
+            raise PLCInvalidArgument("No such site %r"%site_id)
         site = sites[0]
 
         tag_types = TagTypes(self.api, [tag_type_id_or_name])
         if not tag_types:
-            raise PLCInvalidArgument, "No such tag type %r"%tag_type_id_or_name
+            raise PLCInvalidArgument("No such tag type %r"%tag_type_id_or_name)
         tag_type = tag_types[0]
 
         # checks for existence - does not allow several different settings
@@ -56,18 +57,11 @@ class AddSiteTag(Method):
                               'tag_type_id':tag_type['tag_type_id']})
 
         if len(conflicts) :
-            raise PLCInvalidArgument, "Site %d already has setting %d"%(site['site_id'],
-                                                                        tag_type['tag_type_id'])
+            raise PLCInvalidArgument("Site %d already has setting %d"%(site['site_id'],
+                                                                        tag_type['tag_type_id']))
 
         # 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.person_in_site (self.api, self.caller, site):
-            pass
-        else:
-            raise PLCPermissionDenied, "%s: you must be part of the subject site"%self.name
+        site.caller_may_write_tag(self.api,self.caller,tag_type)
             
         site_tag = SiteTag(self.api)
         site_tag['site_id'] = site['site_id']