[Erp5-report] r13167 - in /erp5/trunk/bt5/erp5_web: SkinTemplateItem/portal_skins/erp5_web_...

[nobody at svn.erp5.org]

Author: bartek
Date: Thu Mar  1 23:12:41 2007
New Revision: 13167

URL: http://svn.erp5.org?rev=13167&view=rev
Log:
Call the right script in Contribution, and handle exceptions in it.

Modified:
    erp5/trunk/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_widget_library/WebSite_contributeContent.xml
    erp5/trunk/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_widget_library/WebSite_viewContributeRenderer.xml
    erp5/trunk/bt5/erp5_web/bt/revision

Modified: erp5/trunk/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_widget_library/WebSite_contributeContent.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_widget_library/WebSite_contributeContent.xml?rev=13167&r1=13166&r2=13167&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_widget_library/WebSite_contributeContent.xml (original)
+++ erp5/trunk/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_widget_library/WebSite_contributeContent.xml Thu Mar  1 23:12:41 2007
@@ -72,16 +72,20 @@
   A method invoked with parameters provided by the \n
   contribute widget\n
 """\n
-res = context.portal_contributions.newContent(**kw)\n
-after_method_id = kw.get(\'after_method_id\')\n
-if after_method_id:\n
-  after_method = getattr(res, after_method_id)\n
-  after_method() # if not found will raise exception, as it should\n
+try:\n
+  res = context.portal_contributions.newContent(**kw)\n
+  after_method_id = kw.get(\'after_method_id\')\n
+  if after_method_id:\n
+    after_method = getattr(res, after_method_id)\n
+    after_method() # if not found will raise exception, as it should\n
+  msg = context.Base_translateString(\'Document successfully created\')\n
+  target = res\n
+except Exception, e:\n
+  msg = \'There was a problem: ${exception}\'\n
+  msg = context.Base_translateString(msg, mapping=dict(exception=str(e)))\n
+  target = context\n
 \n
-# XXX Translation and Base_redirect\n
-doc_url = res.absolute_url()+\'/view?portal_status_message=Document+created\'\n
-\n
-return context.REQUEST.RESPONSE.redirect(doc_url)\n
+return target.Base_redirect(\'view\', keep_items=dict(portal_status_message=msg))\n
 </string> </value>
         </item>
         <item>
@@ -133,7 +137,12 @@
                             <string>after_method_id</string>
                             <string>getattr</string>
                             <string>after_method</string>
-                            <string>doc_url</string>
+                            <string>msg</string>
+                            <string>target</string>
+                            <string>Exception</string>
+                            <string>e</string>
+                            <string>dict</string>
+                            <string>str</string>
                           </tuple>
                         </value>
                     </item>

Modified: erp5/trunk/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_widget_library/WebSite_viewContributeRenderer.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_widget_library/WebSite_viewContributeRenderer.xml?rev=13167&r1=13166&r2=13167&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_widget_library/WebSite_viewContributeRenderer.xml (original)
+++ erp5/trunk/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_widget_library/WebSite_viewContributeRenderer.xml Thu Mar  1 23:12:41 2007
@@ -86,7 +86,7 @@
       <input type="submit" name="Memo_makeOOoTemplate:method" value="Make Template" id="maketemplatebutton" disabled="disabled"\n
              style="width:100px;background-image:none;"/>\n
       &nbsp;\n
-      <input type="submit" name="WebSite_contributeFile:method" value="Contribute"/>\n
+      <input type="submit" name="WebSite_contributeContent:method" value="Contribute"/>\n
     </div>\n
       \n
       \n

Modified: erp5/trunk/bt5/erp5_web/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_web/bt/revision?rev=13167&r1=13166&r2=13167&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_web/bt/revision (original)
+++ erp5/trunk/bt5/erp5_web/bt/revision Thu Mar  1 23:12:41 2007
@@ -1,1 +1,1 @@
-532
+534