From 4d8aec2c2bfe0cda5c71904bccf9f0d41228aea1 Mon Sep 17 00:00:00 2001
From: Ivan Tyagov <ivan@nexedi.com>
Date: Fri, 15 Jun 2007 07:14:57 +0000
Subject: [PATCH] Removed uneeded condition. Show error message to user.
git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@14831 20353a03-c40f-0410-a6d1-a30d3c3de9de
---
.../WebSite_contributeContent.xml | 46 ++++++++-----------
1 file changed, 20 insertions(+), 26 deletions(-)
diff --git a/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_widget_library/WebSite_contributeContent.xml b/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_widget_library/WebSite_contributeContent.xml
index bf84014e56..dd083a823a 100644
--- a/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_widget_library/WebSite_contributeContent.xml
+++ b/bt5/erp5_web/SkinTemplateItem/portal_skins/erp5_web_widget_library/WebSite_contributeContent.xml
@@ -90,32 +90,26 @@ if contribute_file is not None:\n
# 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
-else:\n
- msg = \'There was a problem: ${exception}\'\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
- target = context\n
- editable_mode = 0\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
\n
return target.Base_redirect(\'view\', \n
keep_items=dict(portal_status_message=msg, \n
@@ -181,8 +175,8 @@ return target.Base_redirect(\'view\', \n
<string>e</string>
<string>msg</string>
<string>dict</string>
- <string>target</string>
<string>str</string>
+ <string>target</string>
</tuple>
</value>
</item>
--
2.30.9