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

[nobody at svn.erp5.org]

Author: jerome
Date: Tue Oct 23 18:24:16 2007
New Revision: 17137

URL: http://svn.erp5.org?rev=17137&view=rev
Log:
Document_checkConversionFormatPermission: make sure Owner can get his own document in original format
Document_convert: honor getSourceReference to set the returned filename


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

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=17137&r1=17136&r2=17137&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 Tue Oct 23 18:24:16 2007
@@ -76,7 +76,7 @@
 \n
 # Users involved in the document may view it in editable mode\n
 if "Associate" in role_list or "Assignee" in role_list or\\\n
-   "Assignor" in role_list or "Manager" in role_list:\n
+   "Assignor" in role_list or "Manager" in role_list or "Owner" in role_list:\n
   return 1\n
 \n
 # Reject original format\n

Modified: erp5/trunk/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/Document_convert.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/Document_convert.xml?rev=17137&r1=17136&r2=17137&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/Document_convert.xml (original)
+++ erp5/trunk/bt5/erp5_dms/SkinTemplateItem/portal_skins/erp5_dms/Document_convert.xml Tue Oct 23 18:24:16 2007
@@ -79,7 +79,13 @@
 data = context.index_html(request, response, format=format, force=force)\n
 typ = response.headers.get(\'content-type\')\n
 \n
-filename = \'%s.%s\' % ((filename or context.title_or_id(), format))\n
+if not filename:\n
+  filename = context.getSourceReference()\n
+  if filename and \'.\' in filename:\n
+    filename = filename[:filename.rindex(\'.\')]\n
+  else:\n
+    filename = context.title_or_id()\n
+filename = \'%s.%s\' % ((filename, format))\n
 if typ == \'application/zip\':\n
   filename += \'.zip\'\n
 \n

Modified: erp5/trunk/bt5/erp5_dms/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_dms/bt/revision?rev=17137&r1=17136&r2=17137&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_dms/bt/revision (original)
+++ erp5/trunk/bt5/erp5_dms/bt/revision Tue Oct 23 18:24:16 2007
@@ -1,1 +1,1 @@
-697
+698