From bfbd9e20dcc5bacff5168e73e3cd02ba5f726f46 Mon Sep 17 00:00:00 2001
From: Ivan Tyagov <ivan@nexedi.com>
Date: Mon, 5 Jul 2010 12:50:36 +0000
Subject: [PATCH] Take last part of format which can contain multiple '.'
separated identifiers.
git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@36865 20353a03-c40f-0410-a6d1-a30d3c3de9de
---
.../portal_skins/erp5_base/Document_getStandardFileName.xml | 5 ++++-
bt5/erp5_base/bt/revision | 2 +-
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Document_getStandardFileName.xml b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Document_getStandardFileName.xml
index 0f2fb73bd5..16b756542d 100644
--- a/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Document_getStandardFileName.xml
+++ b/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Document_getStandardFileName.xml
@@ -75,7 +75,8 @@ if context.getVersion():\n
if context.getLanguage():\n
file_name = \'%s-%s\' % (file_name, context.getLanguage(),)\n
if format or original_extension:\n
- file_name = \'%s.%s\' % (file_name, format or original_extension,)\n
+ extension = (format or original_extension).split(\'.\')[-1]\n
+ file_name = \'%s.%s\' % (file_name, extension,)\n
return file_name\n
</string> </value>
</item>
@@ -120,6 +121,8 @@ return file_name\n
<string>None</string>
<string>original_extension</string>
<string>_getiter_</string>
+ <string>_getitem_</string>
+ <string>extension</string>
</tuple>
</value>
</item>
diff --git a/bt5/erp5_base/bt/revision b/bt5/erp5_base/bt/revision
index d81f86143d..c843fcee2f 100644
--- a/bt5/erp5_base/bt/revision
+++ b/bt5/erp5_base/bt/revision
@@ -1 +1 @@
-794
\ No newline at end of file
+795
\ No newline at end of file
--
2.30.9