X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=PLC%2FMethods%2FDeletePersonFromSite.py;h=0b7280cd2ad3c9136da9ff0a1a01acef19a627a2;hb=e4c0c59e6bf7d7112f019272e04e6595639bcb90;hp=2c481277a00af1ee133dd475aee8926f14f0db43;hpb=3ab53c5221664528325a0edc7ca40c57eb783428;p=plcapi.git

diff --git a/PLC/Methods/DeletePersonFromSite.py b/PLC/Methods/DeletePersonFromSite.py
index 2c48127..0b7280c 100644
--- a/PLC/Methods/DeletePersonFromSite.py
+++ b/PLC/Methods/DeletePersonFromSite.py
@@ -25,6 +25,8 @@ class DeletePersonFromSite(Method):
         ]
 
     returns = Parameter(int, '1 if successful')
+
+    object_type = 'Site'
     
 
     def call(self, auth, person_id_or_email, site_id_or_login_base):
@@ -32,20 +34,25 @@ class DeletePersonFromSite(Method):
         persons = Persons(self.api, [person_id_or_email])
         if not persons:
             raise PLCInvalidArgument, "No such account"
-
         person = persons[0]
 
+        if person['peer_id'] is not None:
+            raise PLCInvalidArgument, "Not a local account"
+
         # Get site information
         sites = Sites(self.api, [site_id_or_login_base])
         if not sites:
             raise PLCInvalidArgument, "No such site"
-
         site = sites[0]
-	PLCCheckLocalSite(site,"DeletePersonFromSite")
+
+        if site['peer_id'] is not None:
+            raise PLCInvalidArgument, "Not a local site"
 
         if site['site_id'] in person['site_ids']:
             site.remove_person(person)
 
+	# Logging variables
 	self.object_ids = [site['site_id']]
-	
+	self.message = 'Person %d deleted from site %d	' % \
+		(person['person_id'], site['site_id'])
         return 1