[Erp5-report] r25861 - in /erp5/trunk/bt5/erp5_administration: SkinTemplateItem/portal_skin...

[nobody at svn.erp5.org]

Author: luke
Date: Wed Mar  4 14:16:02 2009
New Revision: 25861

URL: http://svn.erp5.org?rev=25861&view=rev
Log:
- do not fail in case of problems with getting explanation value, treat it that there is no explanation's activity

Modified:
    erp5/trunk/bt5/erp5_administration/SkinTemplateItem/portal_skins/erp5_administration/ERP5Site_checkCatalogTable.xml
    erp5/trunk/bt5/erp5_administration/bt/revision

Modified: erp5/trunk/bt5/erp5_administration/SkinTemplateItem/portal_skins/erp5_administration/ERP5Site_checkCatalogTable.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_administration/SkinTemplateItem/portal_skins/erp5_administration/ERP5Site_checkCatalogTable.xml?rev=25861&r1=25860&r2=25861&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_administration/SkinTemplateItem/portal_skins/erp5_administration/ERP5Site_checkCatalogTable.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_administration/SkinTemplateItem/portal_skins/erp5_administration/ERP5Site_checkCatalogTable.xml [utf8] Wed Mar  4 14:16:02 2009
@@ -166,10 +166,15 @@
     if exception_portal_type_list is not None and \\\n
         actual_object.getPortalType() in exception_portal_type_list:\n
       continue\n
+    explanation_value = None\n
+    try:\n
+      explanation_value = actual_object.getExplanationValue()\n
+    except AttributeError:\n
+      pass\n
     # There is already activity changing the state\n
     if actual_object.hasActivity() \\\n
-          or (getattr(actual_object, \'getExplanationValue\', None) is not None \\\n
-          and actual_object.getExplanationValue().hasActivity()):\n
+          or (explanation_value is not None \\\n
+          and explanation_value.hasActivity()):\n
         continue\n
     if property_override_method_id is None:\n
       reference_dict = {}\n
@@ -335,8 +340,10 @@
                             <string>message</string>
                             <string>actual_object</string>
                             <string>KeyError</string>
+                            <string>explanation_value</string>
+                            <string>AttributeError</string>
+                            <string>reference_dict</string>
                             <string>getattr</string>
-                            <string>reference_dict</string>
                             <string>attribute_id</string>
                             <string>reference_value</string>
                             <string>catalog_value</string>

Modified: erp5/trunk/bt5/erp5_administration/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_administration/bt/revision?rev=25861&r1=25860&r2=25861&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_administration/bt/revision [utf8] (original)
+++ erp5/trunk/bt5/erp5_administration/bt/revision [utf8] Wed Mar  4 14:16:02 2009
@@ -1,1 +1,1 @@
-43
+45