[Erp5-report] r13768 - in /erp5/trunk/bt5/erp5_web: SkinTemplateItem/portal_skins/erp5_web_...

[nobody at svn.erp5.org]

Author: jp
Date: Thu Mar 29 00:27:37 2007
New Revision: 13768

URL: http://svn.erp5.org?rev=13768&view=rev
Log:
Added support for in place ingestion

Modified:
    erp5/trunk/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_widget_library/WebSite_contributeContent.xml
    erp5/trunk/bt5/erp5_web/bt/revision

Modified: erp5/trunk/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_widget_library/WebSite_contributeContent.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_widget_library/WebSite_contributeContent.xml?rev=13768&r1=13767&r2=13768&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_widget_library/WebSite_contributeContent.xml (original)
+++ erp5/trunk/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_widget_library/WebSite_contributeContent.xml Thu Mar 29 00:27:37 2007
@@ -96,9 +96,13 @@
     file_name = contribute_file.filename\n
   else:\n
     file_name = None\n
-  new_content.discoverMetadata(file_name=file_name) # Consider putting an exception handler\n
-  msg = context.Base_translateString(\'Document successfully created\')\n
-  target = new_content\n
+  merged_content = new_content.discoverMetadata(file_name=file_name) # Consider putting an exception handler\n
+  if merged_content is not new_content:\n
+    msg = context.Base_translateString(\'Document successfully updated\')\n
+    target = merged_content\n
+  else:\n
+    msg = context.Base_translateString(\'Document successfully created\')\n
+    target = new_content\n
   editable_mode = 1\n
 else:\n
 #except Exception, e:\n
@@ -169,6 +173,7 @@
                             <string>new_content</string>
                             <string>hasattr</string>
                             <string>file_name</string>
+                            <string>merged_content</string>
                             <string>msg</string>
                             <string>target</string>
                             <string>editable_mode</string>

Modified: erp5/trunk/bt5/erp5_web/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_web/bt/revision?rev=13768&r1=13767&r2=13768&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_web/bt/revision (original)
+++ erp5/trunk/bt5/erp5_web/bt/revision Thu Mar 29 00:27:37 2007
@@ -1,1 +1,1 @@
-544
+546