From 85df8939eb2d223dbbbbda6e3d045930d59dd25b Mon Sep 17 00:00:00 2001 From: Thierry Parmentelat Date: Tue, 23 Nov 2010 09:47:45 +0100 Subject: [PATCH] fix duplicate arg in helpers --- .../{Accessors_5.0-rc16.readme => Accessors-5.0-rc16.readme} | 0 PLC/Accessors/Accessors_site.py | 3 +-- PLC/AuthorizeHelpers.py | 4 ++-- PLC/Methods/GetPersons.py | 2 -- 4 files changed, 3 insertions(+), 6 deletions(-) rename PLC/Accessors/{Accessors_5.0-rc16.readme => Accessors-5.0-rc16.readme} (100%) diff --git a/PLC/Accessors/Accessors_5.0-rc16.readme b/PLC/Accessors/Accessors-5.0-rc16.readme similarity index 100% rename from PLC/Accessors/Accessors_5.0-rc16.readme rename to PLC/Accessors/Accessors-5.0-rc16.readme diff --git a/PLC/Accessors/Accessors_site.py b/PLC/Accessors/Accessors_site.py index f1305c2..184e43d 100644 --- a/PLC/Accessors/Accessors_site.py +++ b/PLC/Accessors/Accessors_site.py @@ -1,6 +1,5 @@ +# # Thierry Parmentelat - INRIA -# $Id$ -# $URL$ # # Accessors_site.py is the place where you can define your own local tag accessors # this will not be overwritten through rpm upgrades diff --git a/PLC/AuthorizeHelpers.py b/PLC/AuthorizeHelpers.py index 7cbc5ab..9b77238 100644 --- a/PLC/AuthorizeHelpers.py +++ b/PLC/AuthorizeHelpers.py @@ -36,8 +36,8 @@ class AuthorizeHelpers: return caller_person['person_id'] in slice['person_ids'] @staticmethod - def slice_in_site (api, slice, slice): - return caller_person['person_id'] in slice['person_ids'] + def slice_in_site (api, slice, site): + return slice['site_id']==site['site_id'] @staticmethod def node_id_in_slice (api, node_id_or_hostname, slice): diff --git a/PLC/Methods/GetPersons.py b/PLC/Methods/GetPersons.py index 3ebf871..6302765 100644 --- a/PLC/Methods/GetPersons.py +++ b/PLC/Methods/GetPersons.py @@ -1,5 +1,3 @@ -# $Id$ -# $URL$ from PLC.Faults import * from PLC.Method import Method from PLC.Parameter import Parameter, Mixed -- 2.43.0