[Erp5-report] r33029 ivan - in /erp5/trunk/bt5/erp5_ingestion: SkinTemplateItem/portal_skin...

[nobody at svn.erp5.org]

Author: ivan
Date: Tue Feb 23 14:18:12 2010
New Revision: 33029

URL: http://svn.erp5.org?rev=33029&view=rev
Log:
In some case ERP5 form caller may send empty strings.
Make sure that only in this case we do NOT override discovered by metadata values (reference, language, version).

Modified:
    erp5/trunk/bt5/erp5_ingestion/SkinTemplateItem/portal_skins/erp5_ingestion/Base_contribute.xml
    erp5/trunk/bt5/erp5_ingestion/bt/revision

Modified: erp5/trunk/bt5/erp5_ingestion/SkinTemplateItem/portal_skins/erp5_ingestion/Base_contribute.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_ingestion/SkinTemplateItem/portal_skins/erp5_ingestion/Base_contribute.xml?rev=33029&r1=33028&r2=33029&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_ingestion/SkinTemplateItem/portal_skins/erp5_ingestion/Base_contribute.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_ingestion/SkinTemplateItem/portal_skins/erp5_ingestion/Base_contribute.xml [utf8] Tue Feb 23 14:18:12 2010
@@ -111,7 +111,7 @@
   for key in [\'title\', \'reference\', \'group\', \'source_project\', \n
               \'short_title\', \'language\', \'version\', \'description\']:\n
     value = kw.get(key, kw.get(\'field_your_%s\' %key, kw.get(\'field_my_%s\' %key, None)))\n
-    if value is not None:\n
+    if value not in MARKER:\n
       document_edit_kw[key] = value\n
   if attach_document_to_context:\n
     # attach document to current context using follow_up\n

Modified: erp5/trunk/bt5/erp5_ingestion/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_ingestion/bt/revision?rev=33029&r1=33028&r2=33029&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_ingestion/bt/revision [utf8] (original)
+++ erp5/trunk/bt5/erp5_ingestion/bt/revision [utf8] Tue Feb 23 14:18:12 2010
@@ -1,1 +1,1 @@
-73
+74