Fixing merge changes

This commit is contained in:
Sebastien Ros
2013-11-12 18:07:39 -08:00
parent 856bf94853
commit 7b2f7dc165
3 changed files with 4 additions and 2 deletions

View File

@@ -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;
}

View File

@@ -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); }
}
}
}

View File

@@ -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 {