From f105890be0982b9a8646ebc284e1e2d4878433e5 Mon Sep 17 00:00:00 2001
From: Nicolas Delaby <nicolas@nexedi.com>
Date: Mon, 31 Jan 2011 14:46:32 +0000
Subject: [PATCH] provide filename from filename property

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@42831 20353a03-c40f-0410-a6d1-a30d3c3de9de
---
 .../portal_skins/erp5_ingestion/Base_contribute.xml             | 2 +-
 bt5/erp5_ingestion/bt/revision                                  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/bt5/erp5_ingestion/SkinTemplateItem/portal_skins/erp5_ingestion/Base_contribute.xml b/bt5/erp5_ingestion/SkinTemplateItem/portal_skins/erp5_ingestion/Base_contribute.xml
index 9c2faab010..593fc8de9f 100644
--- a/bt5/erp5_ingestion/SkinTemplateItem/portal_skins/erp5_ingestion/Base_contribute.xml
+++ b/bt5/erp5_ingestion/SkinTemplateItem/portal_skins/erp5_ingestion/Base_contribute.xml
@@ -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
diff --git a/bt5/erp5_ingestion/bt/revision b/bt5/erp5_ingestion/bt/revision
index dd1ec209f3..fa59ff276d 100644
--- a/bt5/erp5_ingestion/bt/revision
+++ b/bt5/erp5_ingestion/bt/revision
@@ -1 +1 @@
-132
\ No newline at end of file
+134
\ No newline at end of file
-- 
2.30.9