From 24151bb30e3150c48e1c30948d76fe2deee26e2f Mon Sep 17 00:00:00 2001
From: Arvind Ganesh <arvindganesh@quantumphinance.com>
Date: Sat, 22 Feb 2025 16:27:51 +0530
Subject: [PATCH] SaveAndClose: Separated save from save & continue button in
 Content Type & Admin menu

---
 global.json                                          |  2 +-
 .../Controllers/NodeController.cs                    | 12 ++++++++++--
 .../OrchardCore.AdminMenu/Views/Node/Edit.cshtml     | 10 +++++++++-
 .../Controllers/AdminController.cs                   | 11 +++++++++--
 .../OrchardCore.ContentTypes/Views/Admin/Edit.cshtml | 10 +++++++++-
 5 files changed, 38 insertions(+), 7 deletions(-)

diff --git a/global.json b/global.json
index e8378b52eb6..f0ba6cff2b1 100644
--- a/global.json
+++ b/global.json
@@ -1,6 +1,6 @@
 {
     "sdk": {
-      "version": "9.0.101",
+      "version": "9.0.200",
       "rollForward": "latestMajor"
     }
 }
diff --git a/src/OrchardCore.Modules/OrchardCore.AdminMenu/Controllers/NodeController.cs b/src/OrchardCore.Modules/OrchardCore.AdminMenu/Controllers/NodeController.cs
index 7f85195ae12..7e60d526ee7 100644
--- a/src/OrchardCore.Modules/OrchardCore.AdminMenu/Controllers/NodeController.cs
+++ b/src/OrchardCore.Modules/OrchardCore.AdminMenu/Controllers/NodeController.cs
@@ -193,7 +193,7 @@ public async Task<IActionResult> Edit(string id, string treeNodeId)
     }
 
     [HttpPost]
-    public async Task<IActionResult> Edit(AdminNodeEditViewModel model)
+    public async Task<IActionResult> Edit(AdminNodeEditViewModel model, string submit)
     {
         if (!await _authorizationService.AuthorizeAsync(User, AdminMenuPermissions.ManageAdminMenu))
         {
@@ -225,7 +225,15 @@ public async Task<IActionResult> Edit(AdminNodeEditViewModel model)
             await _adminMenuService.SaveAsync(adminMenu);
 
             await _notifier.SuccessAsync(H["Admin node updated successfully."]);
-            return RedirectToAction(nameof(List), new { id = model.AdminMenuId });
+            if (String.Equals(submit, "saveAndContinue", StringComparison.Ordinal))
+            {
+                model.Editor = editor;
+                return View(model);
+            }
+            else
+            {
+                return RedirectToAction(nameof(List), new { id = model.AdminMenuId });
+            }
         }
 
         await _notifier.ErrorAsync(H["The admin node has validation errors."]);
diff --git a/src/OrchardCore.Modules/OrchardCore.AdminMenu/Views/Node/Edit.cshtml b/src/OrchardCore.Modules/OrchardCore.AdminMenu/Views/Node/Edit.cshtml
index 1932169d601..daa505d5f66 100644
--- a/src/OrchardCore.Modules/OrchardCore.AdminMenu/Views/Node/Edit.cshtml
+++ b/src/OrchardCore.Modules/OrchardCore.AdminMenu/Views/Node/Edit.cshtml
@@ -23,7 +23,15 @@
     </div>
 
     <div class="mb-3">
-        <button class="btn btn-success save" type="submit">@T["Save"]</button>
+        <div class="btn-group mb-1">
+            <button class="btn btn-success save" type="submit" name="submit" value="save">@T["Save"]</button>
+            <button type="button" class="btn btn-success dropdown-toggle dropdown-toggle-split" data-reference="parent" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+                <span class="visually-hidden">@T["Toggle Dropdown"]</span>
+            </button>
+            <div class="dropdown-menu">
+                <button class="dropdown-item save-continue" type="submit" name="submit" value="saveAndContinue">@T["and continue"]</button>
+            </div>
+        </div>
 
         <a class="btn btn-danger delete"
            asp-action="Delete"
diff --git a/src/OrchardCore.Modules/OrchardCore.ContentTypes/Controllers/AdminController.cs b/src/OrchardCore.Modules/OrchardCore.ContentTypes/Controllers/AdminController.cs
index ab2ecdc9913..493d156fa92 100644
--- a/src/OrchardCore.Modules/OrchardCore.ContentTypes/Controllers/AdminController.cs
+++ b/src/OrchardCore.Modules/OrchardCore.ContentTypes/Controllers/AdminController.cs
@@ -149,7 +149,7 @@ public async Task<ActionResult> CreatePOST(CreateTypeViewModel viewModel)
     }
 
     [Admin("ContentTypes/Edit/{id}", "EditType")]
-    public async Task<ActionResult> Edit(string id)
+    public async Task<ActionResult> Edit(string id, string submit)
     {
         if (!await _authorizationService.AuthorizeAsync(User, ContentTypesPermissions.EditContentTypes))
         {
@@ -164,7 +164,14 @@ public async Task<ActionResult> Edit(string id)
         }
 
         typeViewModel.Editor = await _contentDefinitionDisplayManager.BuildTypeEditorAsync(typeViewModel.TypeDefinition, _updateModelAccessor.ModelUpdater);
-
+        if (String.Equals(submit, "save", StringComparison.Ordinal))
+        {
+            return RedirectToAction(nameof(List));
+        }
+        else if (String.Equals(submit, "saveAndContinue", StringComparison.Ordinal))
+        {
+            await _notifier.SuccessAsync(H["Admin node updated successfully."]);
+        }
         return View(typeViewModel);
     }
 
diff --git a/src/OrchardCore.Modules/OrchardCore.ContentTypes/Views/Admin/Edit.cshtml b/src/OrchardCore.Modules/OrchardCore.ContentTypes/Views/Admin/Edit.cshtml
index 2bf5ffcc24c..269f70954d2 100644
--- a/src/OrchardCore.Modules/OrchardCore.ContentTypes/Views/Admin/Edit.cshtml
+++ b/src/OrchardCore.Modules/OrchardCore.ContentTypes/Views/Admin/Edit.cshtml
@@ -184,7 +184,15 @@
     </div>
 
     <div class="mb-3">
-        <button class="btn btn-primary save" type="submit" name="submit.Save" value="Save">@T["Save"]</button>
+        <div class="btn-group mb-1">
+            <button class="btn btn-success save" type="submit" name="submit" value="save">@T["Save"]</button>
+            <button type="button" class="btn btn-success dropdown-toggle dropdown-toggle-split" data-reference="parent" data-bs-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+                <span class="visually-hidden">@T["Toggle Dropdown"]</span>
+            </button>
+            <div class="dropdown-menu">
+                <button class="dropdown-item save-continue" type="submit" name="submit" value="saveAndContinue">@T["and continue"]</button>
+            </div>
+        </div>
 
         @if (contentSettings.IsSystemDefined)
         {