From 9525bb40e7adbb251841663c186494f2b7e72bad Mon Sep 17 00:00:00 2001
From: Gabriel Monnerat <gabriel@tiolive.com>
Date: Thu, 10 Feb 2011 08:25:01 +0000
Subject: [PATCH] refactor code to send mail
git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@43258 20353a03-c40f-0410-a6d1-a30d3c3de9de
---
.../ERP5Site_createNewEmailThread.xml | 5 +++--
.../erp5_web_ung_theme/ung_js/ung_mail.js.xml | 11 +++++++++--
bt5/erp5_web_ung_theme/bt/revision | 2 +-
3 files changed, 13 insertions(+), 5 deletions(-)
diff --git a/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/ERP5Site_createNewEmailThread.xml b/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/ERP5Site_createNewEmailThread.xml
index 26fe2d24b0..aed3d96abf 100644
--- a/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/ERP5Site_createNewEmailThread.xml
+++ b/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/ERP5Site_createNewEmailThread.xml
@@ -68,8 +68,9 @@ email.setRecipient(form.get("to"))\n
email.setCcRecipient(form.get("cc"))\n
email.setBccRecipient(form.get("bcc"))\n
email.setTitle(form.get("subject"))\n
-if form.get("action") == "send":\n
- context.portal_workflow.doActionFor(context, \'post_action\')\n
+email.setTextContent(form.get("text-content"))\n
+if form.get("action") == "send-mail":\n
+ context.portal_workflow.doActionFor(email, \'post_action\')\n
</string> </value>
</item>
<item>
diff --git a/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/ung_js/ung_mail.js.xml b/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/ung_js/ung_mail.js.xml
index bb9642cee4..f82a0d365c 100644
--- a/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/ung_js/ung_mail.js.xml
+++ b/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/ung_js/ung_mail.js.xml
@@ -29,18 +29,24 @@
<item>
<key> <string>raw</string> </key>
<value> <string>function saveEmailThread(event){\n
+ console.log(event);\n
event.preventDefault();\n
var formData = new Array();\n
$("div.compose-mail-page textarea, div.compose-mail-page input").each(function(){\n
formData.push({name: $(this).attr("id"), value: $(this).attr("value")});\n
});\n
- formData.push({name: "action", value: "save"});\n
+ formData.push({name: "action", value: event.currentTarget.id});\n
$.ajax({\n
type: "post",\n
url: "ERP5Site_createNewEmailThread",\n
data: formData,\n
mediaType: "json",\n
});\n
+ if (event.currentTarget.id == "send-mail"){\n
+ var baseUrl = window.location.href.split("?")[0];\n
+ window.location.href = baseUrl + "?reset:int=1";\n
+ }\n
+ \n
}\n
\n
$().ready(function(){\n
@@ -61,7 +67,8 @@ $().ready(function(){\n
$(this).hide();\n
$("tr#bcc").show();\n
});\n
- $("button#save-mail").click(saveEmailThread);\n
+ $("button#save-mail, button#send-mail").click(saveEmailThread);\n
+ \n
});\n
});\n
$("img[alt=\'mail_logo_box\']").click(function(){\n
diff --git a/bt5/erp5_web_ung_theme/bt/revision b/bt5/erp5_web_ung_theme/bt/revision
index d3b9819557..34251f6b24 100644
--- a/bt5/erp5_web_ung_theme/bt/revision
+++ b/bt5/erp5_web_ung_theme/bt/revision
@@ -1 +1 @@
-246
\ No newline at end of file
+247
\ No newline at end of file
--
2.30.9