get rid of svn keywords once and for good

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

diff --git a/PLC/Methods/DeletePCU.py b/PLC/Methods/DeletePCU.py
index 7099b89..fe59abc 100644 (file)
--- a/PLC/Methods/DeletePCU.py
+++ b/PLC/Methods/DeletePCU.py
@@ -2,7 +2,7 @@ from PLC.Faults import *
 from PLC.Method import Method
 from PLC.Parameter import Parameter, Mixed
 from PLC.PCUs import PCU, PCUs
-from PLC.Auth import PasswordAuth
+from PLC.Auth import Auth
 
 class DeletePCU(Method):
     """
@@ -16,30 +16,28 @@ class DeletePCU(Method):
     roles = ['admin', 'pi', 'tech']
 
     accepts = [
-        PasswordAuth(),
+        Auth(),
         PCU.fields['pcu_id'],
         ]
 
     returns = Parameter(int, '1 if successful')
 
+
     def call(self, auth, pcu_id):
         # Get associated PCU details
-        pcus = PCUs(self.api, [pcu_id]).values()
+        pcus = PCUs(self.api, [pcu_id])
         if not pcus:
             raise PLCInvalidArgument, "No such PCU"
         pcu = pcus[0]
 
         if 'admin' not in self.caller['roles']:
-            if not pcu_ids:
-                ok = False
-                sites = Sites(self.api, self.caller['site_ids']).values()
-                for site in sites:
-                    if pcu['pcu_id'] in site['pcu_ids']:
-                        ok = True
-                        break
-                if not ok:
-                    raise PLCPermissionDenied, "Not allowed to delete that PCU"
+            if pcu['site_id'] not in self.caller['site_ids']:
+                raise PLCPermissionDenied, "Not allowed to update that PCU"
 
         pcu.delete()
 
+        # Logging variables
+        self.event_objects = {'PCU': [pcu['pcu_id']]}
+        self.message = 'PCU %d deleted' % pcu['pcu_id']
+
         return 1