Merge branch '1.10.x' into 1.10.x-to-dev

# Conflicts:
#	src/Orchard.Web/Core/Navigation/Controllers/AdminController.cs

src/Orchard.Web/Core/Navigation/Controllers/AdminController.cs

@@ -13,6 +13,7 @@ using Orchard.Data;
 using Orchard.Exceptions;
 using Orchard.Localization;
 using Orchard.Logging;
+using Orchard.Mvc;
 using Orchard.Mvc.Extensions;
 using Orchard.Mvc.Html;
 using Orchard.Security;
@@ -130,11 +131,15 @@ namespace Orchard.Core.Navigation.Controllers {
             return RedirectToAction("Index", new { menuId });
         }
 
+        [HttpPost, ActionName("Edit")]
+        [FormValueRequired("submit.Delete")]
+        public ActionResult EditDeletePOST(int id) => Delete(id);
+
         [HttpPost]
         public ActionResult Delete(int id) {
-
             MenuPart menuPart = _menuService.Get(id);
             int? menuId = null;
+
             if (!_authorizer.Authorize(
                 Permissions.ManageMenus,
                 menuPart == null ? null : _menuService.GetMenu(menuPart.Menu.Id),
@@ -151,7 +156,7 @@ namespace Orchard.Core.Navigation.Controllers {
                     .ToList();
 
                 foreach (var menuItem in menuItems.Concat(new[] { menuPart })) {
-                    // if the menu item is a concrete content item, don't delete it, just unreference the menu
+                    // if the menu item is a concrete content item, don't delete it, just remove the menu reference
                     if (!menuPart.ContentItem.TypeDefinition.Settings.ContainsKey("Stereotype")
                         || menuPart.ContentItem.TypeDefinition.Settings["Stereotype"] != "MenuItem") {
                         menuPart.Menu = null;
@@ -161,6 +166,11 @@ namespace Orchard.Core.Navigation.Controllers {
                     }
                 }
 
+                _notifier.Information(T.Plural(
+                    "The menu item '{1}' has been deleted.",
+                    "The menu item '{1}' and its children have been deleted.",
+                    menuItems.Count() + 1,
+                    menuPart.MenuText));
             }
 
             return RedirectToAction("Index", new { menuId });
@@ -171,7 +181,8 @@ namespace Orchard.Core.Navigation.Controllers {
                 return new HttpUnauthorizedResult();
 
             // create a new temporary menu item
-            var menuPart = _contentManager.New<MenuPart>(id);
+            var contentItem = _contentManager.New(id);
+            var menuPart = contentItem.As<MenuPart>();
 
             if (menuPart == null)
                 return HttpNotFound();
@@ -186,7 +197,7 @@ namespace Orchard.Core.Navigation.Controllers {
                 // filter the content items for this specific menu
                 menuPart.MenuPosition = Position.GetNext(_navigationManager.BuildMenu(menu));
                 menuPart.Menu = menu;
-                var model = _contentManager.BuildEditor(menuPart);
+                var model = _contentManager.BuildEditor(contentItem);
 
                 return View(model);
             }
@@ -205,23 +216,32 @@ namespace Orchard.Core.Navigation.Controllers {
         public ActionResult CreateMenuItemPost(string id, int menuId, string returnUrl) {
             if (!_authorizer.Authorize(Permissions.ManageMenus, _menuService.GetMenu(menuId), T("Couldn't manage the menu")))
                 return new HttpUnauthorizedResult();
-            var menuPart = _contentManager.New<MenuPart>(id);
+
+            var contentItem = _contentManager.New(id);
+            var menuPart = contentItem.As<MenuPart>();
+
             if (menuPart == null)
                 return HttpNotFound();
+
             // load the menu
             var menu = _contentManager.Get(menuId);
             if (menu == null)
                 return HttpNotFound();
 
+            _contentManager.Create(contentItem);
+
             menuPart.Menu = menu;
-            var model = _contentManager.UpdateEditor(menuPart, this);
             menuPart.MenuPosition = Position.GetNext(_navigationManager.BuildMenu(menu));
-            _contentManager.Create(menuPart);
+
+            var model = _contentManager.UpdateEditor(contentItem, this);
+
             if (!ModelState.IsValid) {
                 _transactionManager.Cancel();
                 return View(model);
             }
-            _notifier.Success(T("Your {0} has been added.", menuPart.TypeDefinition.DisplayName));
+
+            _notifier.Information(T("Your {0} has been added.", contentItem.TypeDefinition.DisplayName));
+
             return this.RedirectLocal(returnUrl, () => RedirectToAction("Index"));
         }
 
@@ -315,7 +335,8 @@ namespace Orchard.Core.Navigation.Controllers {
         }
 
         private ActionResult EditPOST(int id, string returnUrl, Action<ContentItem> conditionallyPublish) {
-            var menuPart = _contentManager.GetDraftRequired<MenuPart>(id);
+            var contentItem = _contentManager.GetLatest(id);
+            var menuPart = contentItem.As<MenuPart>();
 
             if (menuPart == null)
                 return HttpNotFound();
@@ -323,8 +344,6 @@ namespace Orchard.Core.Navigation.Controllers {
             if (!_authorizer.Authorize(Permissions.ManageMenus, menuPart.Menu, T("Couldn't manage the menu")))
                 return new HttpUnauthorizedResult();
 
-            var contentItem = menuPart.ContentItem;
-
             string previousRoute = null;
             if (contentItem.Has<IAliasAspect>()
                 && !string.IsNullOrWhiteSpace(returnUrl)

src/Orchard.Web/Core/Navigation/Services/MainMenuService.cs

@@ -41,7 +41,7 @@ namespace Orchard.Core.Navigation.Services {
         }
 
         public MenuPart Get(int menuPartId) {
-            return _contentManager.Get<MenuPart>(menuPartId);
+            return _contentManager.Get<MenuPart>(menuPartId, VersionOptions.Latest);
         }
 
         public IContent Create(string name) {

src/Orchard.Web/Modules/Orchard.Indexing/Commands/IndexingCommands.cs

@@ -4,7 +4,7 @@ using Orchard.Commands;
 using Orchard.ContentManagement;
 using Orchard.Indexing.Services;
 using Orchard.Tasks.Indexing;
-using Orchard.Utility.Extensions;
+using static Orchard.Indexing.Helpers.IndexingHelpers;
 
 namespace Orchard.Indexing.Commands {
     public class IndexingCommands : DefaultOrchardCommandHandler {
@@ -38,27 +38,22 @@ namespace Orchard.Indexing.Commands {
                 return;
             }
 
-            if (string.IsNullOrWhiteSpace(index)) {
+            if (!IsValidIndexName(index)) {
                 Context.Output.WriteLine(T("Invalid index name."));
                 return;
             }
 
-            if (index.ToSafeName() != index) {
+            var indexProvider = _indexManager.GetSearchIndexProvider();
-                Context.Output.WriteLine(T("Invalid index name."));
+            if (indexProvider == null) {
+                Context.Output.WriteLine(T("No indexing service was found. Please enable a module like Lucene."));
             }
             else {
-                var indexProvider = _indexManager.GetSearchIndexProvider();
+                if (indexProvider.Exists(index)) {
-                if(indexProvider == null) {
+                    Context.Output.WriteLine(T("The specified index already exists."));
-                    Context.Output.WriteLine(T("No indexing service was found. Please enable a module like Lucene."));
                 }
                 else {
-                    if (indexProvider.Exists(index)) {
+                    _indexManager.GetSearchIndexProvider().CreateIndex(index);
-                        Context.Output.WriteLine(T("The specified index already exists."));
+                    Context.Output.WriteLine(T("New index has been created successfully."));
-                    }
-                    else {
-                        _indexManager.GetSearchIndexProvider().CreateIndex(index);
-                        Context.Output.WriteLine(T("New index has been created successfully."));
-                    }
                 }
             }
         }
@@ -66,7 +61,7 @@ namespace Orchard.Indexing.Commands {
         [CommandName("index update")]
         [CommandHelp("index update <index>\r\n\t" + "Updates the specified index")]
         public void Update(string index) {
-            if (string.IsNullOrWhiteSpace(index)) {
+            if (!IsValidIndexName(index)) {
                 Context.Output.WriteLine(T("Invalid index name."));
                 return;
             }
@@ -78,7 +73,7 @@ namespace Orchard.Indexing.Commands {
         [CommandName("index rebuild")]
         [CommandHelp("index rebuild <index> \r\n\t" + "Rebuilds the specified index")]
         public void Rebuild(string index) {
-            if (string.IsNullOrWhiteSpace(index)) {
+            if (!IsValidIndexName(index)) {
                 Context.Output.WriteLine(T("Invalid index name."));
                 return;
             }
@@ -91,24 +86,24 @@ namespace Orchard.Indexing.Commands {
         [CommandHelp("index query <index> /Query:<query>\r\n\t" + "Searches the specified <query> terms in the specified index")]
         [OrchardSwitches("Query")]
         public void Search(string index) {
-            if (string.IsNullOrWhiteSpace(index)) {
+            if (!IsValidIndexName(index)) {
                 Context.Output.WriteLine(T("Invalid index name."));
                 return;
             }
 
-            if ( !_indexManager.HasIndexProvider() ) {
+            if (!_indexManager.HasIndexProvider()) {
                 Context.Output.WriteLine(T("No index available"));
                 return;
             }
             var searchBuilder = _indexManager.GetSearchIndexProvider().CreateSearchBuilder(index);
-            var results = searchBuilder.Parse( new [] {"body", "title"}, Query).Search();
+            var results = searchBuilder.Parse(new[] { "body", "title" }, Query).Search();
 
             Context.Output.WriteLine("{0} result{1}\r\n-----------------\r\n", results.Count(), results.Count() > 0 ? "s" : "");
 
             Context.Output.WriteLine("┌──────────────────────────────────────────────────────────────┬────────┐");
             Context.Output.WriteLine("│ {0} │ {1,6} │", "Title" + new string(' ', 60 - "Title".Length), "Score");
             Context.Output.WriteLine("├──────────────────────────────────────────────────────────────┼────────┤");
-            foreach ( var searchHit in results ) {
+            foreach (var searchHit in results) {
                 var contentItem = _contentManager.Get(searchHit.ContentItemId);
                 var metadata = _contentManager.GetItemMetadata(contentItem);
                 var title = String.IsNullOrWhiteSpace(metadata.DisplayText) ? "- no title -" : metadata.DisplayText;
@@ -126,12 +121,12 @@ namespace Orchard.Indexing.Commands {
         [CommandHelp("index stats <index>\r\n\t" + "Displays some statistics about the search index")]
         [OrchardSwitches("IndexName")]
         public void Stats(string index) {
-            if (string.IsNullOrWhiteSpace(index)) {
+            if (!IsValidIndexName(index)) {
                 Context.Output.WriteLine(T("Invalid index name."));
                 return;
             }
 
-            if ( !_indexManager.HasIndexProvider() ) {
+            if (!_indexManager.HasIndexProvider()) {
                 Context.Output.WriteLine(T("No index available"));
                 return;
             }
@@ -140,11 +135,10 @@ namespace Orchard.Indexing.Commands {
         }
 
         [CommandName("index refresh")]
-        [CommandHelp("index refresh /ContentItem:<content item id> \r\n\t" + "Refreshes the index for the specifed <content item id>")]
+        [CommandHelp("index refresh /ContentItem:<content item id> \r\n\t" + "Refreshes the index for the specified <content item id>")]
         [OrchardSwitches("ContentItem")]
         public void Refresh() {
-            int contentItemId;
+            if (!int.TryParse(ContentItem, out int contentItemId)) {
-            if ( !int.TryParse(ContentItem, out contentItemId) ) {
                 Context.Output.WriteLine(T("Invalid content item id. Not an integer."));
                 return;
             }
@@ -152,19 +146,18 @@ namespace Orchard.Indexing.Commands {
             var contentItem = _contentManager.Get(contentItemId);
             _indexingTaskManager.CreateUpdateIndexTask(contentItem);
 
-            Context.Output.WriteLine(T("Content Item marked for reindexing"));
+            Context.Output.WriteLine(T("Content Item marked for re-indexing"));
         }
 
         [CommandName("index delete")]
-        [CommandHelp("index delete /ContentItem:<content item id>\r\n\t" + "Deletes the specifed <content item id> from the index")]
+        [CommandHelp("index delete /ContentItem:<content item id>\r\n\t" + "Deletes the specified <content item id> from the index")]
         [OrchardSwitches("ContentItem")]
         public void Delete() {
-            int contentItemId;
+            if (!int.TryParse(ContentItem, out int contentItemId)) {
-            if(!int.TryParse(ContentItem, out contentItemId)) {
                 Context.Output.WriteLine(T("Invalid content item id. Not an integer."));
                 return;
             }
-            
+
             var contentItem = _contentManager.Get(contentItemId);
             _indexingTaskManager.CreateDeleteIndexTask(contentItem);
 

src/Orchard.Web/Modules/Orchard.Indexing/Controllers/AdminController.cs

@@ -2,12 +2,12 @@
 using System.Linq;
 using System.Web.Mvc;
 using Orchard.Indexing.Services;
+using Orchard.Indexing.ViewModels;
 using Orchard.Localization;
 using Orchard.Logging;
 using Orchard.Security;
-using Orchard.Indexing.ViewModels;
 using Orchard.UI.Notify;
-using Orchard.Utility.Extensions;
+using static Orchard.Indexing.Helpers.IndexingHelpers;
 
 namespace Orchard.Indexing.Controllers {
     public class AdminController : Controller {
@@ -15,7 +15,7 @@ namespace Orchard.Indexing.Controllers {
         private readonly IIndexManager _indexManager;
 
         public AdminController(
-            IIndexingService indexingService, 
+            IIndexingService indexingService,
             IOrchardServices services,
             IIndexManager indexManager) {
             _indexingService = indexingService;
@@ -34,23 +34,21 @@ namespace Orchard.Indexing.Controllers {
                 IndexEntries = Enumerable.Empty<IndexEntry>(),
                 IndexProvider = _indexManager.GetSearchIndexProvider()
             };
-            
+
             if (_indexManager.HasIndexProvider()) {
                 viewModel.IndexEntries = _indexManager.GetSearchIndexProvider().List().Select(x => {
                     try {
                         return _indexingService.GetIndexEntry(x);
                     }
-                    catch(Exception e) {
+                    catch (Exception e) {
                         Logger.Error(e, "Index couldn't be read: " + x);
-                        return new IndexEntry { 
+                        return new IndexEntry {
                             IndexName = x,
                             IndexingStatus = IndexingStatus.Unavailable
                         };
                     }
                 });
             }
-            
-            // Services.Notifier.Information(T("The index might be corrupted. If you can't recover click on Rebuild."));
 
             return View(viewModel);
         }
@@ -59,7 +57,7 @@ namespace Orchard.Indexing.Controllers {
             if (!Services.Authorizer.Authorize(StandardPermissions.SiteOwner, T("Not allowed to manage the search index.")))
                 return new HttpUnauthorizedResult();
 
-            return View("Create", String.Empty);
+            return View("Create");
         }
 
         [HttpPost, ActionName("Create")]
@@ -68,7 +66,7 @@ namespace Orchard.Indexing.Controllers {
                 return new HttpUnauthorizedResult();
 
             var provider = _indexManager.GetSearchIndexProvider();
-            if (String.IsNullOrWhiteSpace(id) || id.ToSafeName() != id) {
+            if (!IsValidIndexName(id)) {
                 Services.Notifier.Error(T("Invalid index name."));
                 return View("Create", id);
             }
@@ -82,9 +80,9 @@ namespace Orchard.Indexing.Controllers {
                 provider.CreateIndex(id);
                 Services.Notifier.Success(T("Index named {0} created successfully", id));
             }
-            catch(Exception e) {
+            catch (Exception e) {
                 Services.Notifier.Error(T("An error occurred while creating the index: {0}", id));
-                Logger.Error("An error occurred while creatign the index " + id, e);
+                Logger.Error("An error occurred while creating the index " + id, e);
                 return View("Create", id);
             }
 
@@ -96,7 +94,12 @@ namespace Orchard.Indexing.Controllers {
             if (!Services.Authorizer.Authorize(StandardPermissions.SiteOwner, T("Not allowed to manage the search index.")))
                 return new HttpUnauthorizedResult();
 
-            _indexingService.UpdateIndex(id);
+            if (IsValidIndexName(id)) {
+                _indexingService.UpdateIndex(id);
+            }
+            else {
+                Services.Notifier.Error(T("Invalid index name."));
+            }
 
             return RedirectToAction("Index");
         }
@@ -106,7 +109,12 @@ namespace Orchard.Indexing.Controllers {
             if (!Services.Authorizer.Authorize(StandardPermissions.SiteOwner, T("Not allowed to manage the search index.")))
                 return new HttpUnauthorizedResult();
 
-            _indexingService.RebuildIndex(id);
+            if (IsValidIndexName(id)) {
+                _indexingService.RebuildIndex(id);
+            }
+            else {
+                Services.Notifier.Error(T("Invalid index name."));
+            }
 
             return RedirectToAction("Index");
         }
@@ -116,7 +124,12 @@ namespace Orchard.Indexing.Controllers {
             if (!Services.Authorizer.Authorize(StandardPermissions.SiteOwner, T("Not allowed to manage the search index.")))
                 return new HttpUnauthorizedResult();
 
-            _indexingService.DeleteIndex(id);
+            if (IsValidIndexName(id)) {
+                _indexingService.DeleteIndex(id);
+            }
+            else {
+                Services.Notifier.Error(T("Invalid index name."));
+            }
 
             return RedirectToAction("Index");
         }

src/Orchard.Web/Modules/Orchard.Indexing/Helpers/IndexingHelpers.cs

@@ -0,0 +1,8 @@
+using Orchard.Utility.Extensions;
+
+namespace Orchard.Indexing.Helpers {
+    public static class IndexingHelpers {
+        public static bool IsValidIndexName(string name) =>
+            !string.IsNullOrWhiteSpace(name) && name.ToSafeName() == name;
+    }
+}

src/Orchard.Web/Modules/Orchard.Indexing/Orchard.Indexing.csproj

@@ -95,6 +95,7 @@
     <Compile Include="AdminMenu.cs" />
     <Compile Include="Commands\IndexingCommands.cs" />
     <Compile Include="Controllers\AdminController.cs" />
+    <Compile Include="Helpers\IndexingHelpers.cs" />
     <Compile Include="Migrations.cs" />
     <Compile Include="Handlers\CreateIndexingTaskHandler.cs" />
     <Compile Include="Handlers\InfosetFieldIndexingHandler.cs" />
@@ -181,4 +182,4 @@
       </FlavorProperties>
     </VisualStudio>
   </ProjectExtensions>
-</Project>
+</Project>