[Erp5-report] r36865 ivan - in /erp5/trunk/bt5/erp5_base: SkinTemplateItem/portal_skins/erp...

nobody at svn.erp5.org nobody at svn.erp5.org
Mon Jul 5 14:50:36 CEST 2010


Author: ivan
Date: Mon Jul  5 14:50:36 2010
New Revision: 36865

URL: http://svn.erp5.org?rev=36865&view=rev
Log:
Take last part of format which can contain multiple '.' separated identifiers.

Modified:
    erp5/trunk/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Document_getStandardFileName.xml
    erp5/trunk/bt5/erp5_base/bt/revision

Modified: erp5/trunk/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Document_getStandardFileName.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Document_getStandardFileName.xml?rev=36865&r1=36864&r2=36865&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Document_getStandardFileName.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Document_getStandardFileName.xml [utf8] Mon Jul  5 14:50:36 2010
@@ -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>

Modified: erp5/trunk/bt5/erp5_base/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_base/bt/revision?rev=36865&r1=36864&r2=36865&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_base/bt/revision [utf8] (original)
+++ erp5/trunk/bt5/erp5_base/bt/revision [utf8] Mon Jul  5 14:50:36 2010
@@ -1 +1 @@
-794
\ No newline at end of file
+795
\ No newline at end of file




More information about the Erp5-report mailing list