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

Merge branch 'dev' into feature/widget-elements

Browse Source
This commit is contained in:
Sipke Schoorstra
2015-11-19 14:03:16 +01:00
parent 5c18f49fa3 d42065acb8
commit bda0f3d732
4 changed files with 26 additions and 10 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.ComponentModel;
using System.Linq;
using System.Web.Mvc;
using System.Web.Routing;
using Orchard.ContentManagement;
using Orchard.Core.Common.Models;
using Orchard.Core.Navigation.Models;
using Orchard.Core.Navigation.Services;
using Orchard.Core.Navigation.ViewModels;
using Orchard.Core.Title.Models;
using Orchard.Localization;
using Orchard.Mvc.Extensions;
using Orchard.UI;
@@ -16,6 +12,7 @@ using Orchard.UI.Notify;
using Orchard.UI.Navigation;
using Orchard.Utility;
using System;
using Orchard.ContentManagement.Handlers;
using Orchard.Logging;
using Orchard.Exceptions;
@@ -24,17 +21,20 @@ namespace Orchard.Core.Navigation.Controllers {
public class AdminController : Controller, IUpdateModel {
private readonly IMenuService _menuService;
private readonly INavigationManager _navigationManager;
private readonly IEnumerable<IContentHandler> _handlers;
private readonly IMenuManager _menuManager;
public AdminController(
IOrchardServices orchardServices,
IMenuService menuService,
IMenuManager menuManager,
INavigationManager navigationManager) {
INavigationManager navigationManager,
IEnumerable<IContentHandler> handlers) {
_menuService = menuService;
_menuManager = menuManager;
_navigationManager = navigationManager;
_handlers = handlers;
Services = orchardServices;
T = NullLocalizer.Instance;
Logger = NullLogger.Instance;
@@ -95,7 +95,16 @@ namespace Orchard.Core.Navigation.Controllers {
if (menuItemEntries != null) {
foreach (var menuItemEntry in menuItemEntries) {
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);
}
}
}

7
src/Orchard.Web/Core/Navigation/Views/MenuItem.Edit.cshtml
View File

@@ -1,4 +1,9 @@
<div class="sections">
@using Orchard.Core.Shapes
@{
var tabs = (IEnumerable<string>)CoreShapes.HarvestAndSortTabs(Model.Content);
Display.LocalNavigation(Tabs: tabs);
}
<div class="sections">
<div class="primary">
@Display(Model.Content)
</div>

4
src/Orchard.Web/Modules/Orchard.OutputCache/Models/CacheItemRecord.cs
View File

@@ -12,7 +12,7 @@ namespace Orchard.OutputCache.Models {
public virtual int GraceTime { get; set; }
public virtual DateTime ValidUntilUtc { get; set; }
public virtual DateTime StoredUntilUtc { get; set; }
public virtual byte[] Output { get; set; }
[StringLengthMax] public virtual byte[] Output { get; set; }
public virtual string ContentType { get; set; }
[StringLength(2048)] public virtual string QueryString { get; set; }
[StringLength(2048)] public virtual string CacheKey { get; set; }
@@ -22,4 +22,4 @@ namespace Orchard.OutputCache.Models {
public virtual int StatusCode { get; set; }
[StringLengthMax] public virtual string Tags { get; set; }
}
}
}