- fix pcu@site check
authorMark Huang <mlhuang@cs.princeton.edu>
Wed, 11 Oct 2006 20:14:18 +0000 (20:14 +0000)
committerMark Huang <mlhuang@cs.princeton.edu>
Wed, 11 Oct 2006 20:14:18 +0000 (20:14 +0000)
PLC/Methods/DeletePCU.py
PLC/Methods/UpdatePCU.py

index 7099b89..a6320ed 100644 (file)
@@ -30,15 +30,14 @@ class DeletePCU(Method):
         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"
+            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"
 
         pcu.delete()
 
index 0d20feb..b338d7e 100644 (file)
@@ -40,15 +40,14 @@ class UpdatePCU(Method):
         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 update that PCU"
+            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 update that PCU"
 
         pcu.update(pcu_fields)
         pcu.sync()