[Erp5-report] r40124 ivan - in /erp5/trunk/bt5/erp5_dms: SkinTemplateItem/portal_skins/erp5...

[nobody at svn.erp5.org]

Author: ivan
Date: Tue Nov  9 16:59:02 2010
New Revision: 40124

URL: http://svn.erp5.org?rev=40124&view=rev
Log:
When generating an image URLfor FCKEditor include its format (use preferences) which is mandatory in order to produce an image output.

Modified:
    erp5/trunk/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/FCKeditor_getSetReferenceUrl.xml
    erp5/trunk/bt5/erp5_dms/bt/revision

Modified: erp5/trunk/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/FCKeditor_getSetReferenceUrl.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/FCKeditor_getSetReferenceUrl.xml?rev=40124&r1=40123&r2=40124&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/FCKeditor_getSetReferenceUrl.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/FCKeditor_getSetReferenceUrl.xml [utf8] Tue Nov  9 16:59:02 2010
@@ -2,10 +2,7 @@
 <ZopeData>
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
-      <tuple>
-        <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
-        <tuple/>
-      </tuple>
+      <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
     </pickle>
     <pickle>
       <dictionary>
@@ -59,7 +56,8 @@ if brain.getValidationState() == \'embed
   reference = brain.getId()\n
 else:\n
   reference = brain.getReference()\n
-return "javascript:SelectFile(\'%s\')" % reference.replace("\'", "\\\\\'")\n
+format = context.getPortalObject().portal_preferences.getPreferredImageFormat()\n
+return "javascript:SelectFile(\'%s?format=%s\')" % (reference.replace("\'", "\\\\\'"), format)\n
 </string> </value>
         </item>
         <item>
@@ -100,6 +98,8 @@ return "javascript:SelectFile(\'%s\')" %
                             <string>kw</string>
                             <string>_getattr_</string>
                             <string>reference</string>
+                            <string>context</string>
+                            <string>format</string>
                           </tuple>
                         </value>
                     </item>

Modified: erp5/trunk/bt5/erp5_dms/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_dms/bt/revision?rev=40124&r1=40123&r2=40124&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_dms/bt/revision [utf8] (original)
+++ erp5/trunk/bt5/erp5_dms/bt/revision [utf8] Tue Nov  9 16:59:02 2010
@@ -1 +1 @@
-1206
\ No newline at end of file
+1207
\ No newline at end of file