[Erp5-report] r14831 - /erp5/trunk/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_widg...

[nobody at svn.erp5.org]

Author: ivan
Date: Fri Jun 15 09:14:57 2007
New Revision: 14831

URL: http://svn.erp5.org?rev=14831&view=rev
Log:
Removed uneeded condition. Show error message to user.

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

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=14831&r1=14830&r2=14831&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 Fri Jun 15 09:14:57 2007
@@ -90,32 +90,26 @@
 # We want to discover metadata synchronously\n
 kw[\'discover_metadata\'] = 0 \n
 \n
-if 1:\n
-  editable_mode = 1\n
-  file_name = getattr(contribute_file, \'filename\', None)\n
-  # try to ingest file\n
-  try:\n
-    new_content = context.portal_contributions.newContent(**kw)\n
-    merged_content = new_content.discoverMetadata(file_name=file_name)\n
-  except Exception, e:\n
-    # there are errors during ingestion content\n
-    msg = \'There was a problem during ingestion. Please try again later.\'\n
-    msg = context.Base_translateString(msg)\n
-    return context.Base_redirect(\'WebSite_viewAsSCALE\', \n
-                                  keep_items=dict(portal_status_message=msg,\n
-                                                  editable_mode=0))\n
-  # successful ingestion, show appropriate message\n
-  if merged_content is not new_content:\n
-    msg = context.Base_translateString(\'Document successfully updated\')\n
-    target = merged_content\n
-  else:\n
-    msg = context.Base_translateString(\'Document successfully created\')\n
-    target = new_content\n
+editable_mode = 1\n
+file_name = getattr(contribute_file, \'filename\', None)\n
+# try to ingest file\n
+try:\n
+  new_content = context.portal_contributions.newContent(**kw)\n
+  merged_content = new_content.discoverMetadata(file_name=file_name)\n
+except Exception, e:\n
+  # there are errors during ingestion content\n
+  msg = \'There was a problem during ingestion: ${exception}. Please try again later.\'\n
+  msg = context.Base_translateString(msg, mapping=dict(exception=str(e)))\n
+  return context.Base_redirect(\'WebSite_viewAsSCALE\', \n
+                                keep_items=dict(portal_status_message=msg,\n
+                                                editable_mode=0))\n
+# successful ingestion, show appropriate message\n
+if merged_content is not new_content:\n
+  msg = context.Base_translateString(\'Document successfully updated\')\n
+  target = merged_content\n
 else:\n
-  msg = \'There was a problem: ${exception}\'\n
-  msg = context.Base_translateString(msg, mapping=dict(exception=str(e)))\n
-  target = context\n
-  editable_mode = 0\n
+  msg = context.Base_translateString(\'Document successfully created\')\n
+  target = new_content\n
 \n
 return target.Base_redirect(\'view\', \n
                             keep_items=dict(portal_status_message=msg, \n
@@ -181,8 +175,8 @@
                             <string>e</string>
                             <string>msg</string>
                             <string>dict</string>
+                            <string>str</string>
                             <string>target</string>
-                            <string>str</string>
                           </tuple>
                         </value>
                     </item>