lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2025-10-15 11:44:58 +08:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Merge pull request #6006 from paynecrl97/bug/6005/menu_events

Browse Source 
Fires Updating and Updated events when menu items are re-ordered
This commit is contained in:
Sébastien Ros
2015-11-12 12:05:26 -08:00
parent 278e22e1b2 4b93f3f493
commit 4573f65c19
1 changed files with 16 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/Orchard.Web/Core/Navigation/Controllers/AdminController.cs
View File

@@ -1,14 +1,10 @@
using System.Collections.Generic; using System.Collections.Generic;
using System.ComponentModel;
using System.Linq; using System.Linq;
using System.Web.Mvc; using System.Web.Mvc;
using System.Web.Routing;
using Orchard.ContentManagement; using Orchard.ContentManagement;
using Orchard.Core.Common.Models;
using Orchard.Core.Navigation.Models; using Orchard.Core.Navigation.Models;
using Orchard.Core.Navigation.Services; using Orchard.Core.Navigation.Services;
using Orchard.Core.Navigation.ViewModels; using Orchard.Core.Navigation.ViewModels;
using Orchard.Core.Title.Models;
using Orchard.Localization; using Orchard.Localization;
using Orchard.Mvc.Extensions; using Orchard.Mvc.Extensions;
using Orchard.UI; using Orchard.UI;
@@ -16,6 +12,7 @@ using Orchard.UI.Notify;
using Orchard.UI.Navigation; using Orchard.UI.Navigation;
using Orchard.Utility; using Orchard.Utility;
using System; using System;
using Orchard.ContentManagement.Handlers;
using Orchard.Logging; using Orchard.Logging;
using Orchard.Exceptions; using Orchard.Exceptions;
@@ -24,17 +21,20 @@ namespace Orchard.Core.Navigation.Controllers {
public class AdminController : Controller, IUpdateModel { public class AdminController : Controller, IUpdateModel {
private readonly IMenuService _menuService; private readonly IMenuService _menuService;
private readonly INavigationManager _navigationManager; private readonly INavigationManager _navigationManager;
private readonly IEnumerable<IContentHandler> _handlers;
private readonly IMenuManager _menuManager; private readonly IMenuManager _menuManager;
public AdminController( public AdminController(
IOrchardServices orchardServices, IOrchardServices orchardServices,
IMenuService menuService, IMenuService menuService,
IMenuManager menuManager, IMenuManager menuManager,
INavigationManager navigationManager) { INavigationManager navigationManager,
IEnumerable<IContentHandler> handlers) {
_menuService = menuService; _menuService = menuService;
_menuManager = menuManager; _menuManager = menuManager;
_navigationManager = navigationManager; _navigationManager = navigationManager;
_handlers = handlers;
Services = orchardServices; Services = orchardServices;
T = NullLocalizer.Instance; T = NullLocalizer.Instance;
Logger = NullLogger.Instance; Logger = NullLogger.Instance;
@@ -95,7 +95,16 @@ namespace Orchard.Core.Navigation.Controllers {
if (menuItemEntries != null) { if (menuItemEntries != null) {
foreach (var menuItemEntry in menuItemEntries) { foreach (var menuItemEntry in menuItemEntries) {
MenuPart menuPart = _menuService.Get(menuItemEntry.MenuItemId); MenuPart menuPart = _menuService.Get(menuItemEntry.MenuItemId);
menuPart.MenuPosition = menuItemEntry.Position;
if (menuPart.MenuPosition != menuItemEntry.Position) {
var context = new UpdateContentContext(menuPart.ContentItem);
_handlers.Invoke(handler => handler.Updating(context), Logger);
menuPart.MenuPosition = menuItemEntry.Position;
_handlers.Invoke(handler => handler.Updated(context), Logger);
}
} }
} }