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

Also pulling AdaptedViewModel

Browse Source 
--HG--
branch : dev
This commit is contained in:
Nathan Heskew
2010-09-01 11:41:06 -07:00
parent 61210404fa
commit dfb6e98af0
3 changed files with 3 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/Orchard/Mvc/Html/LayoutExtensions.cs
View File

@@ -86,9 +86,9 @@ namespace Orchard.Mvc.Html {
manager.Render(html, html.ViewData.Model.Zones, null, null, except);
}
public static void ZoneBody<TModel>(this HtmlHelper<TModel> html, string zoneName) where TModel : BaseViewModel {
html.Zone(zoneName, () => html.RenderBody());
}
//public static void ZoneBody<TModel>(this HtmlHelper<TModel> html, string zoneName) where TModel : BaseViewModel {
// html.Zone(zoneName, () => html.RenderBody());
//}
public static void RegisterMeta(this HtmlHelper html, string name, string content) {
html.Resolve<IResourceManager>().RegisterMeta(name, content);

66
src/Orchard/Mvc/ViewModels/AdaptedViewModel.cs
View File

@@ -1,66 +0,0 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Web.Mvc;
using Orchard.Security;
using Orchard.UI.Navigation;
using Orchard.UI.Notify;
using Orchard.UI.Zones;
namespace Orchard.Mvc.ViewModels {
class AdaptedViewModel : BaseViewModel {
private readonly Property<ZoneCollection> _zones;
private readonly Property<IEnumerable<MenuItem>> _menu;
private readonly Property<IList<NotifyEntry>> _messages;
private readonly Property<IUser> _currentUser;
public AdaptedViewModel(ViewDataDictionary original) {
_zones = new Property<ZoneCollection>(original, "Zones", () => new ZoneCollection());
_menu = new Property<IEnumerable<MenuItem>>(original, "Menu", Enumerable.Empty<MenuItem>);
_messages = new Property<IList<NotifyEntry>>(original, "Messages", () => new NotifyEntry[0]);
_currentUser = new Property<IUser>(original, "CurrentUser", () => null);
}
public override ZoneCollection Zones { get { return _zones.Value; } set { _zones.Value = value; } }
public override IEnumerable<MenuItem> Menu { get { return _menu.Value; } set { _menu.Value = value; } }
public override IList<NotifyEntry> Messages { get { return _messages.Value; } set { _messages.Value = value; } }
public override IUser CurrentUser { get { return _currentUser.Value; } set { _currentUser.Value = value; } }
class Property<TProperty> where TProperty : class {
private readonly ViewDataDictionary _original;
private readonly string _expression;
private Func<TProperty> _builder;
private TProperty _value;
public Property(ViewDataDictionary original, string expression, Func<TProperty> builder) {
_original = original;
_expression = expression;
_builder = builder;
}
public TProperty Value {
get {
if (_value == null && _builder != null) {
object temp;
if (_original.TryGetValue(_expression, out temp) &&
temp is TProperty) {
SetValue(temp as TProperty);
}
else {
SetValue(_builder());
}
}
return _value;
}
set { SetValue(value); }
}
private void SetValue(TProperty value) {
_builder = null;
_value = value;
_original[_expression] = _value;
}
}
}
}

1
src/Orchard/Orchard.Framework.csproj
View File

@@ -635,7 +635,6 @@
<Compile Include="Mvc\Routes\UrlPrefixAdjustedHttpContext.cs" />
<Compile Include="Mvc\Routes\ShellRoute.cs" />
<Compile Include="Mvc\ViewEngines\WebForms\ThemeViewLocationCache.cs" />
<Compile Include="Mvc\ViewModels\AdaptedViewModel.cs" />
<Compile Include="Mvc\ViewUserControl.cs">
<SubType>ASPXCodeBehind</SubType>
</Compile>