From 9ac140b80fb0536eb98025684c56841287efab08 Mon Sep 17 00:00:00 2001 From: Sapan Bhatia Date: Fri, 23 Jan 2015 16:11:29 +0000 Subject: [PATCH] Bug fixes in model policies --- planetstack/model_policies/model_policy_Controller.py | 3 --- planetstack/model_policies/model_policy_SitePrivilege.py | 2 +- planetstack/model_policies/model_policy_Slice.py | 2 +- planetstack/model_policies/model_policy_SlicePrivilege.py | 2 +- 4 files changed, 3 insertions(+), 6 deletions(-) diff --git a/planetstack/model_policies/model_policy_Controller.py b/planetstack/model_policies/model_policy_Controller.py index 98eeaff..6d73e0c 100644 --- a/planetstack/model_policies/model_policy_Controller.py +++ b/planetstack/model_policies/model_policy_Controller.py @@ -3,9 +3,6 @@ def handle(controller): from core.models import Controller, Site, ControllerSite, Slice, ControllerSlice, User, ControllerUser from collections import defaultdict - #controller = Controller.get(controller_id) - - # relations for all sites ctrls_by_site = defaultdict(list) ctrl_sites = ControllerSite.objects.all() diff --git a/planetstack/model_policies/model_policy_SitePrivilege.py b/planetstack/model_policies/model_policy_SitePrivilege.py index 6e9a65c..d9c6a1e 100644 --- a/planetstack/model_policies/model_policy_SitePrivilege.py +++ b/planetstack/model_policies/model_policy_SitePrivilege.py @@ -6,7 +6,7 @@ def handle(site_privilege): controller_site_privileges = ControllerSitePrivilege.objects.filter( site_privilege = site_privilege, ) - existing_controllers = [csp.controller for sp in controller_site_privileges] + existing_controllers = [sp.controller for sp in controller_site_privileges] all_controllers = Controller.objects.all() for controller in all_controllers: if controller not in existing_controllers: diff --git a/planetstack/model_policies/model_policy_Slice.py b/planetstack/model_policies/model_policy_Slice.py index 1f58570..a9936bd 100644 --- a/planetstack/model_policies/model_policy_Slice.py +++ b/planetstack/model_policies/model_policy_Slice.py @@ -7,7 +7,7 @@ def handle(slice): controller_slices = ControllerSlice.objects.filter(slice=slice) existing_controllers = [cs.controller for cs in controller_slices] - + all_controllers = Controller.objects.all() for controller in all_controllers: if controller not in existing_controllers: diff --git a/planetstack/model_policies/model_policy_SlicePrivilege.py b/planetstack/model_policies/model_policy_SlicePrivilege.py index e58a973..bca7f22 100644 --- a/planetstack/model_policies/model_policy_SlicePrivilege.py +++ b/planetstack/model_policies/model_policy_SlicePrivilege.py @@ -6,7 +6,7 @@ def handle(slice_privilege): controller_slice_privileges = ControllerSlicePrivilege.objects.filter( slice_privilege = slice_privilege, ) - existing_controllers = [csp.controller for sp in controller_slice_privileges] + existing_controllers = [sp.controller for sp in controller_slice_privileges] all_controllers = Controller.objects.all() for controller in all_controllers: if controller not in existing_controllers: -- 2.43.0