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

Adding WorkContext to view pages

Browse Source 
Including in IOrchardViewPage to ensure it's present in all locations

--HG--
branch : theming
This commit is contained in:
Louis DeJardin
2010-09-13 13:09:20 -07:00
parent 73f9e1de8c
commit b8a7e1ec46
4 changed files with 18 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/Orchard/Mvc/IOrchardViewPage.cs
View File

@@ -10,5 +10,6 @@ namespace Orchard.Mvc {
Localizer T { get; } Localizer T { get; }
dynamic Display { get; } dynamic Display { get; }
IHtmlString DisplayChildren(object shape); IHtmlString DisplayChildren(object shape);
WorkContext WorkContext { get; }
} }
} }

7
src/Orchard/Mvc/ViewEngines/Razor/WebViewPage.cs
View File

@@ -13,10 +13,12 @@ namespace Orchard.Mvc.ViewEngines.Razor {
private object _display; private object _display;
private object _new; private object _new;
private Localizer _localizer = NullLocalizer.Instance; private Localizer _localizer = NullLocalizer.Instance;
private WorkContext _workContext;
public Localizer T { get { return _localizer; } } public Localizer T { get { return _localizer; } }
public dynamic Display { get { return _display; } } public dynamic Display { get { return _display; } }
public WorkContext WorkContext { get { return _workContext; } }
public dynamic New { get { return _new; } } public dynamic New { get { return _new; } }
@@ -28,8 +30,8 @@ namespace Orchard.Mvc.ViewEngines.Razor {
public override void InitHelpers() { public override void InitHelpers() {
base.InitHelpers(); base.InitHelpers();
var workContext = ViewContext.GetWorkContext(); _workContext = ViewContext.GetWorkContext();
workContext.Resolve<IComponentContext>().InjectUnsetProperties(this); _workContext.Resolve<IComponentContext>().InjectUnsetProperties(this);
_localizer = LocalizationUtilities.Resolve(ViewContext, VirtualPath); _localizer = LocalizationUtilities.Resolve(ViewContext, VirtualPath);
_display = DisplayHelperFactory.CreateHelper(ViewContext, this); _display = DisplayHelperFactory.CreateHelper(ViewContext, this);
@@ -48,6 +50,7 @@ namespace Orchard.Mvc.ViewEngines.Razor {
} }
return writer; return writer;
} }
} }
public abstract class WebViewPage : WebViewPage<dynamic> { public abstract class WebViewPage : WebViewPage<dynamic> {

10
src/Orchard/Mvc/ViewPage.cs
View File

@@ -1,4 +1,5 @@
using System.Web; using System;
using System.Web;
using System.Web.Mvc; using System.Web.Mvc;
using Autofac; using Autofac;
using Orchard.DisplayManagement; using Orchard.DisplayManagement;
@@ -13,9 +14,11 @@ namespace Orchard.Mvc {
public class ViewPage<TModel> : System.Web.Mvc.ViewPage<TModel>, IOrchardViewPage { public class ViewPage<TModel> : System.Web.Mvc.ViewPage<TModel>, IOrchardViewPage {
private object _display; private object _display;
private Localizer _localizer = NullLocalizer.Instance; private Localizer _localizer = NullLocalizer.Instance;
private WorkContext _workContext;
public Localizer T { get { return _localizer; } } public Localizer T { get { return _localizer; } }
public dynamic Display { get { return _display; } } public dynamic Display { get { return _display; } }
public WorkContext WorkContext { get { return _workContext; } }
public IDisplayHelperFactory DisplayHelperFactory { get; set; } public IDisplayHelperFactory DisplayHelperFactory { get; set; }
public IAuthorizer Authorizer { get; set; } public IAuthorizer Authorizer { get; set; }
@@ -23,8 +26,8 @@ namespace Orchard.Mvc {
public override void InitHelpers() { public override void InitHelpers() {
base.InitHelpers(); base.InitHelpers();
var workContext = ViewContext.GetWorkContext(); _workContext = ViewContext.GetWorkContext();
workContext.Resolve<IComponentContext>().InjectUnsetProperties(this); _workContext.Resolve<IComponentContext>().InjectUnsetProperties(this);
_localizer = LocalizationUtilities.Resolve(ViewContext, AppRelativeVirtualPath); _localizer = LocalizationUtilities.Resolve(ViewContext, AppRelativeVirtualPath);
_display = DisplayHelperFactory.CreateHelper(ViewContext, this); _display = DisplayHelperFactory.CreateHelper(ViewContext, this);
@@ -45,6 +48,7 @@ namespace Orchard.Mvc {
} }
return writer; return writer;
} }
} }
public class ViewPage : ViewPage<dynamic> { public class ViewPage : ViewPage<dynamic> {

6
src/Orchard/Mvc/ViewUserControl.cs
View File

@@ -12,18 +12,20 @@ namespace Orchard.Mvc {
private object _display; private object _display;
private object _new; private object _new;
private Localizer _localizer = NullLocalizer.Instance; private Localizer _localizer = NullLocalizer.Instance;
private WorkContext _workContext;
public Localizer T { get { return _localizer; } } public Localizer T { get { return _localizer; } }
public dynamic Display { get { return _display; } } public dynamic Display { get { return _display; } }
public dynamic New { get { return _new; } } public dynamic New { get { return _new; } }
public WorkContext WorkContext { get { return _workContext; } }
public IDisplayHelperFactory DisplayHelperFactory { get; set; } public IDisplayHelperFactory DisplayHelperFactory { get; set; }
public IShapeHelperFactory ShapeHelperFactory { get; set; } public IShapeHelperFactory ShapeHelperFactory { get; set; }
public IAuthorizer Authorizer { get; set; } public IAuthorizer Authorizer { get; set; }
public override void RenderView(ViewContext viewContext) { public override void RenderView(ViewContext viewContext) {
var workContext = viewContext.GetWorkContext(); _workContext = viewContext.GetWorkContext();
workContext.Resolve<IComponentContext>().InjectUnsetProperties(this); _workContext.Resolve<IComponentContext>().InjectUnsetProperties(this);
_localizer = LocalizationUtilities.Resolve(viewContext, AppRelativeVirtualPath); _localizer = LocalizationUtilities.Resolve(viewContext, AppRelativeVirtualPath);
_display = DisplayHelperFactory.CreateHelper(viewContext, this); _display = DisplayHelperFactory.CreateHelper(viewContext, this);