From 3607ce2f2b78044912326716cb8de52386035f86 Mon Sep 17 00:00:00 2001 From: nlitkowski Date: Thu, 20 Dec 2018 01:22:51 +0100 Subject: [PATCH] naprawiony mailsener --- .../MailSender/Controllers/HomeController.cs | 20 +++++++++++++++---- .../Forum/MailSender/Models/MailModel.cs | 4 ++++ .../Forum/MailSender/Views/Home/Index.cshtml | 6 ++++-- 3 files changed, 24 insertions(+), 6 deletions(-) diff --git a/Trunk/Server/Forum/MailSender/Controllers/HomeController.cs b/Trunk/Server/Forum/MailSender/Controllers/HomeController.cs index 8bfc5f6..93b9c0a 100644 --- a/Trunk/Server/Forum/MailSender/Controllers/HomeController.cs +++ b/Trunk/Server/Forum/MailSender/Controllers/HomeController.cs @@ -7,20 +7,32 @@ using Newtonsoft.Json; namespace MailSender.Controllers { + [RoutePrefix("")] public class HomeController : Controller { [HttpPost] public ActionResult Index([System.Web.Http.FromBody]MailDTO.MailDTO mail) { - var model = new Models.MailModel(mail); - return View(model); + var model = new Models.MailModel(mail); + TempData.Add("mailMod", model); + return View(model); + } + + [HttpGet] + public ActionResult Index() + { + if(TempData["mailMod"] != null) + { + return View(TempData["mailMod"]); + } + return View(new Models.MailModel()); } [System.Web.Http.HttpGet] public ActionResult Error(string errMsg) { - ViewData.Add("errMsg", errMsg); - return View(); + TempData.Add("errMsg", errMsg); + return RedirectToAction("Index"); } [System.Web.Mvc.HttpPost] diff --git a/Trunk/Server/Forum/MailSender/Models/MailModel.cs b/Trunk/Server/Forum/MailSender/Models/MailModel.cs index 4201f0a..b6a7ec0 100644 --- a/Trunk/Server/Forum/MailSender/Models/MailModel.cs +++ b/Trunk/Server/Forum/MailSender/Models/MailModel.cs @@ -30,6 +30,10 @@ namespace MailSender.Models [StringLength(500, ErrorMessage = "Message has to have between 1 and 500 chars", MinimumLength = 1)] public string Content { get; set; } + public MailModel() + { + Content = EMailTo = Subject = string.Empty; + } public MailModel(MailDTO.MailDTO DTO) { diff --git a/Trunk/Server/Forum/MailSender/Views/Home/Index.cshtml b/Trunk/Server/Forum/MailSender/Views/Home/Index.cshtml index 695e0cd..50471c1 100644 --- a/Trunk/Server/Forum/MailSender/Views/Home/Index.cshtml +++ b/Trunk/Server/Forum/MailSender/Views/Home/Index.cshtml @@ -4,9 +4,11 @@ } -@if (ViewData.ContainsKey("mailErr")) +@if (TempData["mailErr"] != null) { -

Error: @ViewData["mailErr"]

+ string errStr = TempData["mailErr"] as string; +

Error: @TempData["mailErr"]

+ TempData["mailErr"] = null; } @using (Html.BeginForm("Send", "Home", FormMethod.Post))