[Erp5-report] r42831 nicolas - in /erp5/trunk/bt5/erp5_ingestion: SkinTemplateItem/portal_s...

[nobody at svn.erp5.org]

Author: nicolas
Date: Mon Jan 31 15:46:32 2011
New Revision: 42831

URL: http://svn.erp5.org?rev=42831&view=rev
Log:
provide filename from filename property

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=42831&r1=42830&r2=42831&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] Mon Jan 31 15:46:32 2011
@@ -97,7 +97,6 @@ if url is not None:\n
       redirect_url= \'%s?%s\' %(cancel_url, \n
                             make_query(dict(portal_status_message=translateString("Wrong or not accessible URL address."))))\n
       return context.REQUEST.RESPONSE.redirect(redirect_url)\n
-  filename=document.getId()\n
 else:\n
   # contribute file\n
   document_kw.update({\'file\': file})\n
@@ -109,6 +108,7 @@ if synchronous_metadata_discovery:\n
   # this in an activity\n
   if document.isSupportBaseDataConversion():\n
     document.processFile()\n
+  filename = document.getFilename()\n
   merged_document = document.Document_convertToBaseFormatAndDiscoverMetadata(\n
                                filename=filename,\n
                                user_login=user_login,\n

Modified: erp5/trunk/bt5/erp5_ingestion/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_ingestion/bt/revision?rev=42831&r1=42830&r2=42831&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_ingestion/bt/revision [utf8] (original)
+++ erp5/trunk/bt5/erp5_ingestion/bt/revision [utf8] Mon Jan 31 15:46:32 2011
@@ -1 +1 @@
-132
\ No newline at end of file
+134
\ No newline at end of file