[Erp5-report] r11440 - in /erp5/trunk/bt5/erp5_dms: ExtensionTemplateItem/ SkinTemplateItem...

[nobody at svn.erp5.org]

Author: bartek
Date: Wed Nov 22 16:27:01 2006
New Revision: 11440

URL: http://svn.erp5.org?rev=11440&view=rev
Log:
trap exception in ingestion if no data; fix display of related value if relation is None (#93)

Modified:
    erp5/trunk/bt5/erp5_dms/ExtensionTemplateItem/documentUtils.py
    erp5/trunk/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/Base_getRelatedObjectTitle.xml
    erp5/trunk/bt5/erp5_dms/bt/revision

Modified: erp5/trunk/bt5/erp5_dms/ExtensionTemplateItem/documentUtils.py
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_dms/ExtensionTemplateItem/documentUtils.py?rev=11440&r1=11439&r2=11440&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_dms/ExtensionTemplateItem/documentUtils.py (original)
+++ erp5/trunk/bt5/erp5_dms/ExtensionTemplateItem/documentUtils.py Wed Nov 22 16:27:01 2006
@@ -24,6 +24,7 @@
 def getAttrFromContent(self,data,ptype):
   if ptype!='Memo':return {}
   atrs={}
+  if data is None:return {}
   fileno=rx_fileno.search(data)
   if fileno:
     dic=fileno.groupdict()

Modified: erp5/trunk/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/Base_getRelatedObjectTitle.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/Base_getRelatedObjectTitle.xml?rev=11440&r1=11439&r2=11440&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/Base_getRelatedObjectTitle.xml (original)
+++ erp5/trunk/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/Base_getRelatedObjectTitle.xml Wed Nov 22 16:27:01 2006
@@ -71,6 +71,7 @@
             <value> <string># get related object title in a security-aware way (without throwing exception\n
 # if I don\'t have permissions to access the object)\n
 cat_value=context.getProperty(category)\n
+if cat_value is None:return \'\'\n
 ob=context.restrictedTraverse(cat_value,None)\n
 return ob is not None and ob.getTitle() or \'\'\n
 </string> </value>

Modified: erp5/trunk/bt5/erp5_dms/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_dms/bt/revision?rev=11440&r1=11439&r2=11440&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_dms/bt/revision (original)
+++ erp5/trunk/bt5/erp5_dms/bt/revision Wed Nov 22 16:27:01 2006
@@ -1,1 +1,1 @@
-341
+344