[Erp5-report] r40260 kazuhiko - in /erp5/trunk/bt5/erp5_base: SkinTemplateItem/portal_skins...

[nobody at svn.erp5.org]

Author: kazuhiko
Date: Mon Nov 15 10:31:08 2010
New Revision: 40260

URL: http://svn.erp5.org?rev=40260&view=rev
Log:
2010-11-15 Kazuhiko
* improve Document_getStandardFileName so that the extention in the original filename will be used as the fallback.

Modified:
    erp5/trunk/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Document_getStandardFileName.xml
    erp5/trunk/bt5/erp5_base/bt/change_log
    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=40260&r1=40259&r2=40260&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 Nov 15 10:31:08 2010
@@ -64,15 +64,18 @@ elif context.hasSourceReference():\n
   file_name = context.getSourceReference()\n
 else:\n
   file_name = context.getTitleOrId()\n
-original_extension = None\n
+extension = None\n
 if \'.\' in file_name:\n
-  file_name, original_extension = file_name.rsplit(\'.\', 1)\n
+  file_name, extension = file_name.rsplit(\'.\', 1)\n
 if context.getVersion():\n
   file_name = \'%s-%s\' % (file_name, context.getVersion(),)\n
 if context.getLanguage():\n
   file_name = \'%s-%s\' % (file_name, context.getLanguage(),)\n
-if format or original_extension:\n
-  extension = (format or original_extension).split(\'.\')[-1]\n
+if format:\n
+  extension = format.rsplit(\'.\')[-1]\n
+elif not extension and context.hasSourceReference():\n
+  extension = context.getSourceReference().rsplit(\'.\')[-1]\n
+if extension:\n
   file_name = \'%s.%s\' % (file_name, extension,)\n
 return file_name\n
 </string> </value>
@@ -116,10 +119,9 @@ return file_name\n
                             <string>context</string>
                             <string>file_name</string>
                             <string>None</string>
-                            <string>original_extension</string>
+                            <string>extension</string>
                             <string>_getiter_</string>
                             <string>_getitem_</string>
-                            <string>extension</string>
                           </tuple>
                         </value>
                     </item>

Modified: erp5/trunk/bt5/erp5_base/bt/change_log
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_base/bt/change_log?rev=40260&r1=40259&r2=40260&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_base/bt/change_log [utf8] (original)
+++ erp5/trunk/bt5/erp5_base/bt/change_log [utf8] Mon Nov 15 10:31:08 2010
@@ -1,3 +1,6 @@
+2010-11-15 Kazuhiko
+* improve Document_getStandardFileName so that the extention in the original filename will be used as the fallback.
+
 2010-10-13 yo
 * Drop Decimal Exponent and change Precision to a Float Field (through Proxy Field) in the view of Rounding Model.
 

Modified: erp5/trunk/bt5/erp5_base/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_base/bt/revision?rev=40260&r1=40259&r2=40260&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_base/bt/revision [utf8] (original)
+++ erp5/trunk/bt5/erp5_base/bt/revision [utf8] Mon Nov 15 10:31:08 2010
@@ -1 +1 @@
-896
\ No newline at end of file
+897
\ No newline at end of file