mirror of
https://github.com/OrchardCMS/Orchard.git
synced 2026-02-09 09:16:41 +08:00
Fixing merge changes
This commit is contained in:
@@ -182,6 +182,7 @@ namespace Orchard.Core.Navigation.Drivers {
|
||||
part.Breadcrumb = model.Breadcrumb;
|
||||
part.AddHomePage = model.AddHomePage;
|
||||
part.AddCurrentPage = model.AddCurrentPage;
|
||||
part.ShowFullMenu = model.ShowFullMenu;
|
||||
part.MenuContentItemId = model.CurrentMenuId;
|
||||
}
|
||||
|
||||
|
||||
@@ -34,8 +34,8 @@ namespace Orchard.Core.Navigation.Models {
|
||||
}
|
||||
|
||||
public bool ShowFullMenu {
|
||||
get { return bool.Parse(this.As<InfosetPart>().Get<MenuWidgetPart>("ShowFullMenu") ?? "false"); }
|
||||
set { this.As<InfosetPart>().Set<MenuWidgetPart>("ShowFullMenu", value.ToString()); }
|
||||
get { return this.Retrieve(x => x.ShowFullMenu); }
|
||||
set { this.Store(x => x.ShowFullMenu, value); }
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -9,6 +9,7 @@ using Orchard.ContentManagement;
|
||||
using Orchard.Data;
|
||||
using Orchard.Environment.Configuration;
|
||||
using Orchard.Mvc.Routes;
|
||||
using Orchard.Settings;
|
||||
|
||||
namespace Orchard.Mvc {
|
||||
public class MvcModule : Module {
|
||||
|
||||
Reference in New Issue
Block a user