Merge branch 'feature/6196_SupportForAttachments' into Laser/1.10.x

LaserSrl · Oct 28, 2016 · 5fe0b69 · 5fe0b69
2 parents 0daad70 + e3a7059
commit 5fe0b69
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/src/Orchard.Web/Modules/Orchard.Email/Controllers/EmailAdminController.cs b/src/Orchard.Web/Modules/Orchard.Email/Controllers/EmailAdminController.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Web.Hosting;
 using System.Web.Mvc;
 using Orchard.ContentManagement;
 using Orchard.Email.Models;
@@ -56,18 +57,19 @@ public ActionResult TestSettings(TestSmtpSettings testSettings) {
                         {"Body", testSettings.Body},
                         {"ReplyTo", testSettings.ReplyTo},
                         {"Bcc", testSettings.Bcc},
-                        {"CC", testSettings.Cc}
+                        {"CC", testSettings.Cc},
+                        { "Attachments", new List<string>() { HostingEnvironment.MapPath("~/Media/OrchardLogo.png") } }
                     });
                 }
 
                 if (!String.IsNullOrEmpty(fakeLogger.Message)) {
                     return Json(new { error = fakeLogger.Message });
                 }
 
-                return Json(new {status = T("Message sent.").Text});
+                return Json(new { status = T("Message sent.").Text });
             }
             catch (Exception e) {
-                return Json(new {error = e.Message});
+                return Json(new { error = e.Message });
             }
             finally {
                 var smtpChannelComponent = _smtpChannel as Component;

diff --git a/src/Orchard.Web/Modules/Orchard.Email/Views/EditorTemplates/Parts/SmtpSettings.cshtml b/src/Orchard.Web/Modules/Orchard.Email/Views/EditorTemplates/Parts/SmtpSettings.cshtml
@@ -91,6 +91,10 @@
     <div>
         <textarea id="emailtestbody"></textarea>
     </div>
+    <div>
+        <label>@T("Attachments:")</label>
+        <img src="~/Media/OrchardLogo.png" style="width:100px" alt="@T("Orchard icon")" title="@T("The Orchard icon will be attached to this test e-mail")"/>
+    </div>
     <div>
         <button type="button" id="emailtestsend" class="button grey">@T("Send")</button>
     </div>