From e15bc0f6b19ac098acfccb19e42b09e6a6ddbf75 Mon Sep 17 00:00:00 2001
From: Romain Courteaud <romain@nexedi.com>
Date: Mon, 16 Jul 2007 14:56:16 +0000
Subject: [PATCH] Use getProperty instead of getattr.
git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@15224 20353a03-c40f-0410-a6d1-a30d3c3de9de
---
product/ERP5Form/PlanningBox.py | 25 ++++++++++++++++---------
1 file changed, 16 insertions(+), 9 deletions(-)
diff --git a/product/ERP5Form/PlanningBox.py b/product/ERP5Form/PlanningBox.py
index 351c400ed7..f828764c90 100644
--- a/product/ERP5Form/PlanningBox.py
+++ b/product/ERP5Form/PlanningBox.py
@@ -1835,16 +1835,23 @@ class BasicGroup:
# previously recovered method
block_begin = None
block_end = None
- if object_property_begin is not None:
- block_begin = \
- getattr(activity_content.getObject(),object_property_begin)
- else:
- block_begin = None
- if object_property_end is not None:
- block_end = getattr(activity_content.getObject(),object_property_end)
- else:
- block_end = None
+ obj = activity_content.getObject()
+ _marker = []
+
+ try:
+ block_begin = obj.getProperty(object_property_begin, _marker)
+ if block_begin is _marker:
+ raise AttributeError, object_property_begin
+ except AttributeError:
+ block_begin = getattr(obj, object_property_begin, None)
+
+ try:
+ block_end = obj.getProperty(object_property_end, _marker)
+ if block_end is _marker:
+ raise AttributeError, object_property_end
+ except AttributeError:
+ block_end = getattr(obj, object_property_end, None)
# handling case where activity bound is not defined
if block_begin is None:
--
2.30.9