[Erp5-report] r21268 - in /erp5/trunk/bt5/erp5_ingestion: SkinTemplateItem/portal_skins/erp...

[nobody at svn.erp5.org]

Author: romain
Date: Mon Jun  2 17:08:54 2008
New Revision: 21268

URL: http://svn.erp5.org?rev=21268&view=rev
Log:
Catch Unauthorized exception which may be raised by index_html (through checkConversionFormatPermission script), and return a nicer message to the user.

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

Modified: erp5/trunk/bt5/erp5_ingestion/SkinTemplateItem/portal_skins/erp5_ingestion/Document_convert.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_ingestion/SkinTemplateItem/portal_skins/erp5_ingestion/Document_convert.xml?rev=21268&r1=21267&r2=21268&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_ingestion/SkinTemplateItem/portal_skins/erp5_ingestion/Document_convert.xml (original)
+++ erp5/trunk/bt5/erp5_ingestion/SkinTemplateItem/portal_skins/erp5_ingestion/Document_convert.xml Mon Jun  2 17:08:54 2008
@@ -73,7 +73,14 @@
 request = context.REQUEST\n
 response = request.RESPONSE\n
 \n
-data = context.index_html(request, response, format=format, force=force)\n
+from zExceptions import Unauthorized\n
+\n
+try:\n
+  data = context.index_html(request, response, format=format, force=force)\n
+except Unauthorized:\n
+  msg = context.Base_translateString("You don\'t have enough permission for converting this document.")\n
+  return context.Base_redirect(keep_items=dict(portal_status_message=msg))\n
+\n
 typ = response.headers.get(\'content-type\')\n
 \n
 if not filename:\n
@@ -143,7 +150,11 @@
                             <string>context</string>
                             <string>request</string>
                             <string>response</string>
+                            <string>zExceptions</string>
+                            <string>Unauthorized</string>
                             <string>data</string>
+                            <string>msg</string>
+                            <string>dict</string>
                             <string>typ</string>
                             <string>_getitem_</string>
                             <string>_inplacevar_</string>

Modified: erp5/trunk/bt5/erp5_ingestion/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_ingestion/bt/revision?rev=21268&r1=21267&r2=21268&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_ingestion/bt/revision (original)
+++ erp5/trunk/bt5/erp5_ingestion/bt/revision Mon Jun  2 17:08:54 2008
@@ -1,1 +1,1 @@
-10
+11