From 0661e251eb7c451f23ce69357acdb120d9f73faa Mon Sep 17 00:00:00 2001 From: Pedro Ferreira Date: Thu, 4 Jul 2013 14:24:42 +0200 Subject: [PATCH] [FIX] None value coming from getOwner() --- indico/MaKaC/conference.py | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/indico/MaKaC/conference.py b/indico/MaKaC/conference.py index fbb14693e..b1d42785b 100644 --- a/indico/MaKaC/conference.py +++ b/indico/MaKaC/conference.py @@ -10859,11 +10859,13 @@ class Material(CommonObjectBase): return None def getConference( self ): - if type(self.getOwner()) is Conference: - return self.getOwner() - if type(self.getOwner()) is Category: + owner = self.getOwner() + if owner is None or isinstance(owner, Category): return None - return self.getOwner().getConference() + elif isinstance(owner, Conference): + return owner + else: + return owner.getConference() def getSession( self ): if self.getContribution(): @@ -11476,7 +11478,7 @@ class Resource(CommonObjectBase): # protection checking functions call getConference() # directly on resources, without caring whether they # are owned by Conferences or Categories - if isinstance(self._owner, Category): + if self._owner is None or isinstance(self._owner, Category): return None else: return self._owner.getConference() -- 2.11.4.GIT