[Erp5-report] r16761 - /erp5/trunk/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/

[nobody at svn.erp5.org]

Author: jp
Date: Mon Oct  1 20:45:25 2007
New Revision: 16761

URL: http://svn.erp5.org?rev=16761&view=rev
Log:
More formats supported

Modified:
    erp5/trunk/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/Document_checkConversionFormatPermission.xml

Modified: erp5/trunk/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/Document_checkConversionFormatPermission.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/Document_checkConversionFormatPermission.xml?rev=16761&r1=16760&r2=16761&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/Document_checkConversionFormatPermission.xml (original)
+++ erp5/trunk/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/Document_checkConversionFormatPermission.xml Mon Oct  1 20:45:25 2007
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.PythonScripts.PythonScript</string>
-          <string>PythonScript</string>
-        </tuple>
-        <none/>
+        <global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -82,9 +79,17 @@
    "Assignor" in role_list or "Manager" in role_list:\n
   return 1\n
 \n
+# Reject original format\n
+if format is None:\n
+  return 0\n
+\n
 # All users with view permission may view the document \n
 # in read only mode\n
-if format in (\'html\', \'stripped-html\', \'pdf\', \'png\', \'jpg\', \'gif\'):\n
+if format in (\'html\', \'stripped-html\', \'text\', \'txt\', \'pdf\', \'png\', \'jpg\', \'gif\'):\n
+  return 1\n
+if format.endswith(\'pdf\'):\n
+  return 1\n
+if format.endswith(\'html\'):\n
   return 1\n
 \n
 # All other formats are prohibitted\n
@@ -144,6 +149,7 @@
                             <string>user</string>
                             <string>context</string>
                             <string>role_list</string>
+                            <string>None</string>
                           </tuple>
                         </value>
                     </item>