Settings render message

Author: rxtur

src/App/Pages/Admin/AdminPageModel.cs

@@ -20,6 +20,15 @@ public class AdminPageModel : PageModel
         public string Error { get; set; }
         public bool ShowError => !string.IsNullOrEmpty(Error);
 
+        public string RenderMessage()
+        {
+            var msg = ShowMessage ?
+                $"<script>toastr.success('{Message}')</script>" :
+                (ShowError ? $"<script>toastr.error('{Error}')</script>" : "");
+            Clear();
+            return msg;
+        }
+
         public void Clear()
         {
             Message = "";

src/App/Pages/Admin/Settings/Index.cshtml

@@ -54,10 +54,6 @@
 <partial name="~/Pages/Admin/Shared/_FileMgr.cshtml" />
 
 @section Scripts{
-    @if (Model.ShowMessage)
-    {
-        <script>toastr.success('@Model.Message')</script>
-        Model.Message = "";
-    }
+    @Html.Raw(Model.RenderMessage())
     <script src="~/admin/js/app/fileManagerController.js"></script>
 }

src/App/Pages/Admin/Settings/Password.cshtml

@@ -29,8 +29,5 @@
     </div>
 </div>
 @section Scripts{
-    @if (Model.ShowMessage)
-    {
-        <script>toastr.success('@Model.Message')</script>
-    }
+    @Html.Raw(Model.RenderMessage())
 }

src/App/Pages/Admin/Settings/Profile.cshtml

@@ -66,9 +66,6 @@
 <partial name="~/Pages/Admin/Shared/_FileMgr.cshtml" />
 
 @section Scripts{
-    @if (Model.ShowMessage)
-    {
-        <script>toastr.success('@Model.Message')</script>
-    }
+    @Html.Raw(Model.RenderMessage())
     <script src="~/admin/js/app/fileManagerController.js"></script>
 }

src/App/Pages/Admin/Settings/Register.cshtml

@@ -37,8 +37,5 @@
     </div>
 </div>
 @section Scripts{
-    @if (Model.ShowMessage)
-    {
-        <script>toastr.success('@Model.Message')</script>
-    }
+    @Html.Raw(Model.RenderMessage())
 }

src/App/Pages/Admin/Settings/Themes.cshtml

@@ -49,14 +49,7 @@
     </div>
 </div>
 @section Scripts{
-    @if (Model.ShowMessage)
-    {
-        <script>toastr.success('@Model.Message')</script>
-    }
-    @if (Model.ShowError)
-    {
-        <script>toastr.error('@Model.Error')</script>
-    }
+    @Html.Raw(Model.RenderMessage())
     <script>
         var submitForm = function (id, act) {
             $("#hdnTheme").val(id);

src/App/Pages/Admin/Settings/Themes.cshtml.cs

@@ -67,8 +67,8 @@ public async Task<IActionResult> OnPostAsync()
                 else
                 {
                     theme.Content = id;
-                    Message = Resources.Updated;
                 }
+                Message = Resources.Updated;
                 _db.Complete();
             }
 

src/App/Pages/Admin/Settings/Users.cshtml

@@ -31,8 +31,5 @@
 </div>
 
 @section Scripts{
-    @if (Model.ShowMessage)
-    {
-        <script>toastr.success('@Model.Message')</script>
-    }
+    @Html.Raw(Model.RenderMessage())
 }

src/Core/Core.csproj

@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <TargetFramework>netcoreapp2.1</TargetFramework>
-    <Version>2.1.0.4</Version>
+    <Version>2.1.0.5</Version>
   </PropertyGroup>
 
   <ItemGroup>