[Erp5-report] r43258 gabriel - in /erp5/trunk/bt5/erp5_web_ung_theme: SkinTemplateItem/port...

[nobody at svn.erp5.org]

Author: gabriel
Date: Thu Feb 10 09:25:01 2011
New Revision: 43258

URL: http://svn.erp5.org?rev=43258&view=rev
Log:
refactor code to send mail

Modified:
    erp5/trunk/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/ERP5Site_createNewEmailThread.xml
    erp5/trunk/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/ung_js/ung_mail.js.xml
    erp5/trunk/bt5/erp5_web_ung_theme/bt/revision

Modified: erp5/trunk/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/ERP5Site_createNewEmailThread.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/ERP5Site_createNewEmailThread.xml?rev=43258&r1=43257&r2=43258&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/ERP5Site_createNewEmailThread.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/ERP5Site_createNewEmailThread.xml [utf8] Thu Feb 10 09:25:01 2011
@@ -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>

Modified: erp5/trunk/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/ung_js/ung_mail.js.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/ung_js/ung_mail.js.xml?rev=43258&r1=43257&r2=43258&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/ung_js/ung_mail.js.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_web_ung_theme/SkinTemplateItem/portal_skins/erp5_web_ung_theme/ung_js/ung_mail.js.xml [utf8] Thu Feb 10 09:25:01 2011
@@ -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

Modified: erp5/trunk/bt5/erp5_web_ung_theme/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_web_ung_theme/bt/revision?rev=43258&r1=43257&r2=43258&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_web_ung_theme/bt/revision [utf8] (original)
+++ erp5/trunk/bt5/erp5_web_ung_theme/bt/revision [utf8] Thu Feb 10 09:25:01 2011
@@ -1 +1 @@
-246
\ No newline at end of file
+247
\ No newline at end of file