From 50ff33c386b697bc591b730d23f444df557537b8 Mon Sep 17 00:00:00 2001 From: loudej Date: Thu, 10 Dec 2009 04:19:54 +0000 Subject: [PATCH] Renaming methods to BuildDisplayModel, BuildEditorModel, UpdateEditorModel and models to ItemDisplayModel, ItemEditorModel --HG-- extra : convert_revision : svn%3A5ff7c347-ad56-4c35-b696-ccb81de16e03/trunk%4043654 --- .../Models/DefaultModelManagerTests.cs | 2 +- .../Common/Providers/CommonAspectHandler.cs | 4 +- .../Settings/Controllers/AdminController.cs | 4 +- .../ViewModels/SettingsIndexViewModel.cs | 2 +- .../SettingsIndexViewModel.ascx | 2 +- .../Controllers/BlogController.cs | 16 +++---- .../Controllers/BlogPostController.cs | 10 ++--- .../Orchard.Blogs/Models/BlogPostHandler.cs | 4 +- .../ViewModels/BlogEditViewModel.cs | 2 +- .../ViewModels/BlogForAdminViewModel.cs | 2 +- .../ViewModels/BlogPostEditViewModel.cs | 2 +- .../ViewModels/BlogPostViewModel.cs | 2 +- .../Orchard.Blogs/ViewModels/BlogViewModel.cs | 2 +- .../ViewModels/BlogsForAdminViewModel.cs | 2 +- .../ViewModels/BlogsViewModel.cs | 2 +- .../ViewModels/CreateBlogPostViewModel.cs | 2 +- .../ViewModels/CreateBlogViewModel.cs | 2 +- .../Models/DisplayTemplates/BlogDetail.ascx | 2 +- .../DisplayTemplates/BlogDetailAdmin.ascx | 2 +- .../DisplayTemplates/BlogPostDetail.ascx | 2 +- .../Models/DisplayTemplates/BlogPostList.ascx | 2 +- .../DisplayTemplates/BlogPostListAdmin.ascx | 2 +- .../DisplayTemplates/BlogPostSummary.ascx | 2 +- .../BlogPostSummaryAdmin.ascx | 2 +- .../Models/DisplayTemplates/BlogSummary.ascx | 2 +- .../DisplayTemplates/BlogSummaryAdmin.ascx | 2 +- .../Views/Models/EditorTemplates/Blog.ascx | 2 +- .../Models/EditorTemplates/BlogPost.ascx | 2 +- .../Models/CommentsHandler.cs | 6 +-- .../Controllers/ContentController.cs | 4 +- .../Models/DebugLinkHandler.cs | 4 +- .../ViewModels/ContentDetailsViewModel.cs | 8 ++-- .../Orchard.Media/Models/MediaSettings.cs | 4 +- .../Orchard.Roles/Models/UserRolesHandler.cs | 4 +- .../Controllers/PageController.cs | 8 ++-- .../ViewModels/PageEditViewModel.cs | 2 +- .../ViewModels/PageIndexViewModel.cs | 2 +- .../ViewModels/PageShowViewModel.cs | 2 +- .../Models/DisplayTemplates/SandboxPage.ascx | 2 +- .../DisplayTemplates/SandboxPageSummary.ascx | 2 +- .../Models/EditorTemplates/SandboxPage.ascx | 2 +- .../Controllers/HomeController.cs | 2 +- .../Orchard.Tags/Models/TagsHandler.cs | 4 +- .../ViewModels/TagsSearchViewModel.cs | 2 +- .../Controllers/AdminController.cs | 10 ++--- .../ViewModels/UserCreateViewModel.cs | 2 +- .../ViewModels/UserEditViewModel.cs | 4 +- .../EditorTemplates/UserCreateViewModel.ascx | 2 +- .../EditorTemplates/UserEditViewModel.ascx | 2 +- src/Orchard/Models/DefaultContentManager.cs | 30 ++++++------- ...Context.cs => BuildDisplayModelContext.cs} | 12 +++--- .../Models/Driver/BuildEditorModelContext.cs | 22 ++++++++++ src/Orchard/Models/Driver/ContentHandler.cs | 42 +++++++++--------- .../Models/Driver/ContentItemTemplates.cs | 43 ++++++++++++------- .../Driver/GetEditorViewModelContext.cs | 22 ---------- src/Orchard/Models/Driver/IContentHandler.cs | 6 +-- .../Models/Driver/IContentTemplateFilter.cs | 6 +-- .../Models/Driver/TemplateFilterBase.cs | 18 ++++---- .../Models/Driver/TemplateFilterForRecord.cs | 4 +- .../Models/Driver/UpdateEditorModelContext.cs | 12 ++++++ .../Driver/UpdateEditorViewModelContext.cs | 12 ------ src/Orchard/Models/IContentManager.cs | 6 +-- .../Models/Records/ContentPartRecord.cs | 2 +- .../Records/ContentPartRecordAlteration.cs | 3 +- ...isplayViewModel.cs => ItemDisplayModel.cs} | 26 +++++------ ...mEditorViewModel.cs => ItemEditorModel.cs} | 31 +++++++++++-- src/Orchard/Mvc/Html/ContentItemExtensions.cs | 2 +- src/Orchard/Mvc/Html/ItemDisplayExtensions.cs | 12 +++--- src/Orchard/Mvc/Html/ItemEditorExtensions.cs | 14 +++--- src/Orchard/Orchard.csproj | 10 ++--- 70 files changed, 266 insertions(+), 231 deletions(-) rename src/Orchard/Models/Driver/{GetDisplayViewModelContext.cs => BuildDisplayModelContext.cs} (52%) create mode 100644 src/Orchard/Models/Driver/BuildEditorModelContext.cs delete mode 100644 src/Orchard/Models/Driver/GetEditorViewModelContext.cs create mode 100644 src/Orchard/Models/Driver/UpdateEditorModelContext.cs delete mode 100644 src/Orchard/Models/Driver/UpdateEditorViewModelContext.cs rename src/Orchard/Models/ViewModels/{ItemDisplayViewModel.cs => ItemDisplayModel.cs} (54%) rename src/Orchard/Models/ViewModels/{ItemEditorViewModel.cs => ItemEditorModel.cs} (50%) diff --git a/src/Orchard.Tests/Models/DefaultModelManagerTests.cs b/src/Orchard.Tests/Models/DefaultModelManagerTests.cs index 7af672da1..5cc0e9669 100644 --- a/src/Orchard.Tests/Models/DefaultModelManagerTests.cs +++ b/src/Orchard.Tests/Models/DefaultModelManagerTests.cs @@ -175,7 +175,7 @@ namespace Orchard.Tests.Models { [Test] public void EditorsShouldBeOrderedByPositionAndDefaultPositionIsSix() { var alpha = _manager.New("alpha"); - var templates = _manager.GetDisplayViewModel(alpha, null, null).Displays; + var templates = _manager.BuildDisplayModel(alpha, null, null).Displays; Assert.That(templates.Count(), Is.EqualTo(3)); var t0 = templates.First(); diff --git a/src/Orchard.Web/Core/Common/Providers/CommonAspectHandler.cs b/src/Orchard.Web/Core/Common/Providers/CommonAspectHandler.cs index 4159c5d2d..1e7e55a07 100644 --- a/src/Orchard.Web/Core/Common/Providers/CommonAspectHandler.cs +++ b/src/Orchard.Web/Core/Common/Providers/CommonAspectHandler.cs @@ -93,7 +93,7 @@ namespace Orchard.Core.Common.Providers { } - private void GetEditor(GetEditorViewModelContext context, CommonAspect instance) { + private void GetEditor(BuildEditorModelContext context, CommonAspect instance) { var currentUser = _authenticationService.GetAuthenticatedUser(); if (!_authorizationService.CheckAccess(currentUser, Permissions.ChangeOwner)) { return; @@ -106,7 +106,7 @@ namespace Orchard.Core.Common.Providers { } - private void UpdateEditor(UpdateEditorViewModelContext context, CommonAspect instance) { + private void UpdateEditor(UpdateEditorModelContext context, CommonAspect instance) { // this event is hooked so the modified timestamp is changed when an edit-post occurs. // kind of a loose rule of thumb. may not be sufficient instance.Record.ModifiedUtc = _clock.UtcNow; diff --git a/src/Orchard.Web/Core/Settings/Controllers/AdminController.cs b/src/Orchard.Web/Core/Settings/Controllers/AdminController.cs index 23d1be411..0b52d0238 100644 --- a/src/Orchard.Web/Core/Settings/Controllers/AdminController.cs +++ b/src/Orchard.Web/Core/Settings/Controllers/AdminController.cs @@ -26,14 +26,14 @@ namespace Orchard.Core.Settings.Controllers { public ActionResult Index(string tabName) { var model = new Orchard.Core.Settings.ViewModels.SettingsIndexViewModel { Site = _siteService.GetSiteSettings().As() }; - model.ItemView = _modelManager.GetEditorViewModel(model.Site, tabName); + model.EditorModel = _modelManager.BuildEditorModel(model.Site, tabName); return View(model); } [AcceptVerbs(HttpVerbs.Post)] public ActionResult Index(string tabName, FormCollection input) { var viewModel = new SettingsIndexViewModel { Site = _siteService.GetSiteSettings().As() }; - viewModel.ItemView = _modelManager.UpdateEditorViewModel(viewModel.Site.ContentItem, tabName, this); + viewModel.EditorModel = _modelManager.UpdateEditorModel(viewModel.Site.ContentItem, tabName, this); if (!TryUpdateModel(viewModel, input.ToValueProvider())) { return View(viewModel); diff --git a/src/Orchard.Web/Core/Settings/ViewModels/SettingsIndexViewModel.cs b/src/Orchard.Web/Core/Settings/ViewModels/SettingsIndexViewModel.cs index 7d39f8967..66b2a39e5 100644 --- a/src/Orchard.Web/Core/Settings/ViewModels/SettingsIndexViewModel.cs +++ b/src/Orchard.Web/Core/Settings/ViewModels/SettingsIndexViewModel.cs @@ -8,7 +8,7 @@ using Orchard.Core.Settings.Models; namespace Orchard.Core.Settings.ViewModels { public class SettingsIndexViewModel : AdminViewModel { public SiteSettings Site { get; set; } - public ItemEditorViewModel ItemView { get; set; } + public ItemEditorModel EditorModel { get; set; } [HiddenInput(DisplayValue = false)] diff --git a/src/Orchard.Web/Core/Settings/Views/Admin/EditorTemplates/SettingsIndexViewModel.ascx b/src/Orchard.Web/Core/Settings/Views/Admin/EditorTemplates/SettingsIndexViewModel.ascx index 5cc7e3dd1..47b39e3bc 100644 --- a/src/Orchard.Web/Core/Settings/Views/Admin/EditorTemplates/SettingsIndexViewModel.ascx +++ b/src/Orchard.Web/Core/Settings/Views/Admin/EditorTemplates/SettingsIndexViewModel.ascx @@ -18,6 +18,6 @@ -<% foreach(var e in Model.ItemView.Editors) {%> +<% foreach(var e in Model.EditorModel.Editors) {%> <%=Html.EditorFor(m => e.Model, e.TemplateName, e.Prefix)%> <%} %> diff --git a/src/Orchard.Web/Packages/Orchard.Blogs/Controllers/BlogController.cs b/src/Orchard.Web/Packages/Orchard.Blogs/Controllers/BlogController.cs index ad1e2ce17..b5f7e26df 100644 --- a/src/Orchard.Web/Packages/Orchard.Blogs/Controllers/BlogController.cs +++ b/src/Orchard.Web/Packages/Orchard.Blogs/Controllers/BlogController.cs @@ -36,7 +36,7 @@ namespace Orchard.Blogs.Controllers { public ActionResult List() { var model = new BlogsViewModel { - Blogs = _blogService.Get().Select(b => _contentManager.GetDisplayViewModel(b, null, "Summary")) + Blogs = _blogService.Get().Select(b => _contentManager.BuildDisplayModel(b, null, "Summary")) }; return View(model); @@ -44,7 +44,7 @@ namespace Orchard.Blogs.Controllers { public ActionResult ListForAdmin() { var model = new BlogsForAdminViewModel { - Blogs = _blogService.Get().Select(b => _contentManager.GetDisplayViewModel(b, null, "SummaryAdmin")) + Blogs = _blogService.Get().Select(b => _contentManager.BuildDisplayModel(b, null, "SummaryAdmin")) }; return View(model); @@ -58,7 +58,7 @@ namespace Orchard.Blogs.Controllers { return new NotFoundResult(); var model = new BlogViewModel { - Blog = _contentManager.GetDisplayViewModel(blog, null, "Detail") + Blog = _contentManager.BuildDisplayModel(blog, null, "Detail") }; return View(model); @@ -72,7 +72,7 @@ namespace Orchard.Blogs.Controllers { return new NotFoundResult(); var model = new BlogForAdminViewModel { - Blog = _contentManager.GetDisplayViewModel(blog, null, "DetailAdmin") + Blog = _contentManager.BuildDisplayModel(blog, null, "DetailAdmin") }; return View(model); @@ -89,7 +89,7 @@ namespace Orchard.Blogs.Controllers { return new NotFoundResult(); var model = new CreateBlogViewModel { - Blog = _contentManager.GetEditorViewModel(blog, null) + Blog = _contentManager.BuildEditorModel(blog, null) }; return View(model); @@ -101,7 +101,7 @@ namespace Orchard.Blogs.Controllers { if (!_authorizer.Authorize(Permissions.CreateBlog, T("Couldn't create blog"))) return new HttpUnauthorizedResult(); - model.Blog = _contentManager.UpdateEditorViewModel(_contentManager.New("blog"), null, this); + model.Blog = _contentManager.UpdateEditorModel(_contentManager.New("blog"), null, this); if (!ModelState.IsValid) return View(model); @@ -127,7 +127,7 @@ namespace Orchard.Blogs.Controllers { return new NotFoundResult(); var model = new BlogEditViewModel { - Blog = _contentManager.GetEditorViewModel(blog, "") + Blog = _contentManager.BuildEditorModel(blog, "") }; return View(model); @@ -145,7 +145,7 @@ namespace Orchard.Blogs.Controllers { return new NotFoundResult(); var model = new BlogEditViewModel { - Blog = _contentManager.UpdateEditorViewModel(blog, "", this) + Blog = _contentManager.UpdateEditorModel(blog, "", this) }; if (!ModelState.IsValid) diff --git a/src/Orchard.Web/Packages/Orchard.Blogs/Controllers/BlogPostController.cs b/src/Orchard.Web/Packages/Orchard.Blogs/Controllers/BlogPostController.cs index b52c958d6..74dd65740 100644 --- a/src/Orchard.Web/Packages/Orchard.Blogs/Controllers/BlogPostController.cs +++ b/src/Orchard.Web/Packages/Orchard.Blogs/Controllers/BlogPostController.cs @@ -54,7 +54,7 @@ namespace Orchard.Blogs.Controllers { var model = new BlogPostViewModel { Blog = blog, - BlogPost = _contentManager.GetDisplayViewModel(post, null, "Detail") + BlogPost = _contentManager.BuildDisplayModel(post, null, "Detail") }; return View(model); @@ -93,7 +93,7 @@ namespace Orchard.Blogs.Controllers { if (blog == null) return new NotFoundResult(); - var blogPost = _contentManager.GetEditorViewModel(_contentManager.New("blogpost"), null); + var blogPost = _contentManager.BuildEditorModel(_contentManager.New("blogpost"), null); blogPost.Item.Blog = blog; var model = new CreateBlogPostViewModel { @@ -116,7 +116,7 @@ namespace Orchard.Blogs.Controllers { BlogPost blogPost = _contentManager.New("blogpost"); blogPost.Blog = blog; - model.BlogPost = _contentManager.UpdateEditorViewModel(blogPost, null, this); + model.BlogPost = _contentManager.UpdateEditorModel(blogPost, null, this); if (!ModelState.IsValid) return View(model); @@ -146,7 +146,7 @@ namespace Orchard.Blogs.Controllers { return new NotFoundResult(); var model = new BlogPostEditViewModel { Blog = blog, BlogPost = null }; - //model.ItemView = _contentManager.GetEditorViewModel(model.Post.ContentItem, null); + //model.EditorModel = _contentManager.BuildEditorModel(model.Post.ContentItem, null); return View(model); } @@ -167,7 +167,7 @@ namespace Orchard.Blogs.Controllers { return new NotFoundResult(); var model = new BlogPostEditViewModel { Blog = blog, BlogPost = null }; - //model.ItemView = _contentManager.UpdateEditorViewModel(model.Post, null, this); + //model.EditorModel = _contentManager.UpdateEditorModel(model.Post, null, this); IValueProvider values = input.ToValueProvider(); TryUpdateModel(model, values); diff --git a/src/Orchard.Web/Packages/Orchard.Blogs/Models/BlogPostHandler.cs b/src/Orchard.Web/Packages/Orchard.Blogs/Models/BlogPostHandler.cs index 89c68e311..9645d3832 100644 --- a/src/Orchard.Web/Packages/Orchard.Blogs/Models/BlogPostHandler.cs +++ b/src/Orchard.Web/Packages/Orchard.Blogs/Models/BlogPostHandler.cs @@ -57,14 +57,14 @@ namespace Orchard.Blogs.Models { switch(context.DisplayType) { case "Detail": context.AddDisplay( - new TemplateViewModel(posts.Select(bp => contentManager.GetDisplayViewModel(bp, null, "Summary"))) { + new TemplateViewModel(posts.Select(bp => contentManager.BuildDisplayModel(bp, null, "Summary"))) { TemplateName = "BlogPostList", ZoneName = "body" }); break; case "DetailAdmin": context.AddDisplay( - new TemplateViewModel(posts.Select(bp => contentManager.GetDisplayViewModel(bp, null, "SummaryAdmin"))) { + new TemplateViewModel(posts.Select(bp => contentManager.BuildDisplayModel(bp, null, "SummaryAdmin"))) { TemplateName = "BlogPostListAdmin", ZoneName = "body" }); diff --git a/src/Orchard.Web/Packages/Orchard.Blogs/ViewModels/BlogEditViewModel.cs b/src/Orchard.Web/Packages/Orchard.Blogs/ViewModels/BlogEditViewModel.cs index b008737f7..b53305a73 100644 --- a/src/Orchard.Web/Packages/Orchard.Blogs/ViewModels/BlogEditViewModel.cs +++ b/src/Orchard.Web/Packages/Orchard.Blogs/ViewModels/BlogEditViewModel.cs @@ -4,6 +4,6 @@ using Orchard.Mvc.ViewModels; namespace Orchard.Blogs.ViewModels { public class BlogEditViewModel : AdminViewModel { - public ItemEditorViewModel Blog { get; set; } + public ItemEditorModel Blog { get; set; } } } \ No newline at end of file diff --git a/src/Orchard.Web/Packages/Orchard.Blogs/ViewModels/BlogForAdminViewModel.cs b/src/Orchard.Web/Packages/Orchard.Blogs/ViewModels/BlogForAdminViewModel.cs index 349c2cbd9..d2b7c0c41 100644 --- a/src/Orchard.Web/Packages/Orchard.Blogs/ViewModels/BlogForAdminViewModel.cs +++ b/src/Orchard.Web/Packages/Orchard.Blogs/ViewModels/BlogForAdminViewModel.cs @@ -4,6 +4,6 @@ using Orchard.Mvc.ViewModels; namespace Orchard.Blogs.ViewModels { public class BlogForAdminViewModel : AdminViewModel { - public ItemDisplayViewModel Blog { get; set; } + public ItemDisplayModel Blog { get; set; } } } \ No newline at end of file diff --git a/src/Orchard.Web/Packages/Orchard.Blogs/ViewModels/BlogPostEditViewModel.cs b/src/Orchard.Web/Packages/Orchard.Blogs/ViewModels/BlogPostEditViewModel.cs index abb765878..d5bac199d 100644 --- a/src/Orchard.Web/Packages/Orchard.Blogs/ViewModels/BlogPostEditViewModel.cs +++ b/src/Orchard.Web/Packages/Orchard.Blogs/ViewModels/BlogPostEditViewModel.cs @@ -5,6 +5,6 @@ using Orchard.Mvc.ViewModels; namespace Orchard.Blogs.ViewModels { public class BlogPostEditViewModel : AdminViewModel { public Blog Blog { get; set; } - public ItemEditorViewModel BlogPost { get; set; } + public ItemEditorModel BlogPost { get; set; } } } \ No newline at end of file diff --git a/src/Orchard.Web/Packages/Orchard.Blogs/ViewModels/BlogPostViewModel.cs b/src/Orchard.Web/Packages/Orchard.Blogs/ViewModels/BlogPostViewModel.cs index 59a7b8304..0127c4e23 100644 --- a/src/Orchard.Web/Packages/Orchard.Blogs/ViewModels/BlogPostViewModel.cs +++ b/src/Orchard.Web/Packages/Orchard.Blogs/ViewModels/BlogPostViewModel.cs @@ -5,6 +5,6 @@ using Orchard.Mvc.ViewModels; namespace Orchard.Blogs.ViewModels { public class BlogPostViewModel : BaseViewModel { public Blog Blog { get; set; } - public ItemDisplayViewModel BlogPost { get; set; } + public ItemDisplayModel BlogPost { get; set; } } } \ No newline at end of file diff --git a/src/Orchard.Web/Packages/Orchard.Blogs/ViewModels/BlogViewModel.cs b/src/Orchard.Web/Packages/Orchard.Blogs/ViewModels/BlogViewModel.cs index ba78599ae..4bf983f45 100644 --- a/src/Orchard.Web/Packages/Orchard.Blogs/ViewModels/BlogViewModel.cs +++ b/src/Orchard.Web/Packages/Orchard.Blogs/ViewModels/BlogViewModel.cs @@ -4,6 +4,6 @@ using Orchard.Mvc.ViewModels; namespace Orchard.Blogs.ViewModels { public class BlogViewModel : BaseViewModel { - public ItemDisplayViewModel Blog { get; set; } + public ItemDisplayModel Blog { get; set; } } } \ No newline at end of file diff --git a/src/Orchard.Web/Packages/Orchard.Blogs/ViewModels/BlogsForAdminViewModel.cs b/src/Orchard.Web/Packages/Orchard.Blogs/ViewModels/BlogsForAdminViewModel.cs index 95dc5f8d6..5c37cfb91 100644 --- a/src/Orchard.Web/Packages/Orchard.Blogs/ViewModels/BlogsForAdminViewModel.cs +++ b/src/Orchard.Web/Packages/Orchard.Blogs/ViewModels/BlogsForAdminViewModel.cs @@ -5,6 +5,6 @@ using Orchard.Mvc.ViewModels; namespace Orchard.Blogs.ViewModels { public class BlogsForAdminViewModel : AdminViewModel { - public IEnumerable> Blogs { get; set; } + public IEnumerable> Blogs { get; set; } } } \ No newline at end of file diff --git a/src/Orchard.Web/Packages/Orchard.Blogs/ViewModels/BlogsViewModel.cs b/src/Orchard.Web/Packages/Orchard.Blogs/ViewModels/BlogsViewModel.cs index f85106ade..197d0ee81 100644 --- a/src/Orchard.Web/Packages/Orchard.Blogs/ViewModels/BlogsViewModel.cs +++ b/src/Orchard.Web/Packages/Orchard.Blogs/ViewModels/BlogsViewModel.cs @@ -5,6 +5,6 @@ using Orchard.Mvc.ViewModels; namespace Orchard.Blogs.ViewModels { public class BlogsViewModel : BaseViewModel { - public IEnumerable> Blogs { get; set; } + public IEnumerable> Blogs { get; set; } } } \ No newline at end of file diff --git a/src/Orchard.Web/Packages/Orchard.Blogs/ViewModels/CreateBlogPostViewModel.cs b/src/Orchard.Web/Packages/Orchard.Blogs/ViewModels/CreateBlogPostViewModel.cs index e378f09b1..2f15abb1c 100644 --- a/src/Orchard.Web/Packages/Orchard.Blogs/ViewModels/CreateBlogPostViewModel.cs +++ b/src/Orchard.Web/Packages/Orchard.Blogs/ViewModels/CreateBlogPostViewModel.cs @@ -4,6 +4,6 @@ using Orchard.Mvc.ViewModels; namespace Orchard.Blogs.ViewModels { public class CreateBlogPostViewModel : AdminViewModel { - public ItemEditorViewModel BlogPost { get; set; } + public ItemEditorModel BlogPost { get; set; } } } \ No newline at end of file diff --git a/src/Orchard.Web/Packages/Orchard.Blogs/ViewModels/CreateBlogViewModel.cs b/src/Orchard.Web/Packages/Orchard.Blogs/ViewModels/CreateBlogViewModel.cs index cb2ea9be9..a4ddbeccd 100644 --- a/src/Orchard.Web/Packages/Orchard.Blogs/ViewModels/CreateBlogViewModel.cs +++ b/src/Orchard.Web/Packages/Orchard.Blogs/ViewModels/CreateBlogViewModel.cs @@ -4,6 +4,6 @@ using Orchard.Mvc.ViewModels; namespace Orchard.Blogs.ViewModels { public class CreateBlogViewModel : AdminViewModel { - public ItemEditorViewModel Blog { get; set; } + public ItemEditorModel Blog { get; set; } } } \ No newline at end of file diff --git a/src/Orchard.Web/Packages/Orchard.Blogs/Views/Models/DisplayTemplates/BlogDetail.ascx b/src/Orchard.Web/Packages/Orchard.Blogs/Views/Models/DisplayTemplates/BlogDetail.ascx index 4e474e149..0f3652d0e 100644 --- a/src/Orchard.Web/Packages/Orchard.Blogs/Views/Models/DisplayTemplates/BlogDetail.ascx +++ b/src/Orchard.Web/Packages/Orchard.Blogs/Views/Models/DisplayTemplates/BlogDetail.ascx @@ -1,4 +1,4 @@ -<%@ Control Language="C#" Inherits="System.Web.Mvc.ViewUserControl>" %> +<%@ Control Language="C#" Inherits="System.Web.Mvc.ViewUserControl>" %> <%@ Import Namespace="Orchard.Mvc.Html"%> <%@ Import Namespace="Orchard.Blogs.Extensions"%> <%@ Import Namespace="Orchard.Blogs.Models"%> diff --git a/src/Orchard.Web/Packages/Orchard.Blogs/Views/Models/DisplayTemplates/BlogDetailAdmin.ascx b/src/Orchard.Web/Packages/Orchard.Blogs/Views/Models/DisplayTemplates/BlogDetailAdmin.ascx index 4dcb2f39d..43836feac 100644 --- a/src/Orchard.Web/Packages/Orchard.Blogs/Views/Models/DisplayTemplates/BlogDetailAdmin.ascx +++ b/src/Orchard.Web/Packages/Orchard.Blogs/Views/Models/DisplayTemplates/BlogDetailAdmin.ascx @@ -1,4 +1,4 @@ -<%@ Control Language="C#" Inherits="System.Web.Mvc.ViewUserControl>" %> +<%@ Control Language="C#" Inherits="System.Web.Mvc.ViewUserControl>" %> <%@ Import Namespace="Orchard.Mvc.Html"%> <%@ Import Namespace="Orchard.Models.ViewModels"%> <%@ Import Namespace="Orchard.Blogs.Extensions"%> diff --git a/src/Orchard.Web/Packages/Orchard.Blogs/Views/Models/DisplayTemplates/BlogPostDetail.ascx b/src/Orchard.Web/Packages/Orchard.Blogs/Views/Models/DisplayTemplates/BlogPostDetail.ascx index bd543e0f0..ce4488ce9 100644 --- a/src/Orchard.Web/Packages/Orchard.Blogs/Views/Models/DisplayTemplates/BlogPostDetail.ascx +++ b/src/Orchard.Web/Packages/Orchard.Blogs/Views/Models/DisplayTemplates/BlogPostDetail.ascx @@ -1,4 +1,4 @@ -<%@ Control Language="C#" Inherits="System.Web.Mvc.ViewUserControl>" %> +<%@ Control Language="C#" Inherits="System.Web.Mvc.ViewUserControl>" %> <%@ Import Namespace="Orchard.Mvc.Html"%> <%@ Import Namespace="Orchard.Models.ViewModels"%> <%@ Import Namespace="Orchard.Blogs.Extensions"%> diff --git a/src/Orchard.Web/Packages/Orchard.Blogs/Views/Models/DisplayTemplates/BlogPostList.ascx b/src/Orchard.Web/Packages/Orchard.Blogs/Views/Models/DisplayTemplates/BlogPostList.ascx index 7a6218032..874c1d3f5 100644 --- a/src/Orchard.Web/Packages/Orchard.Blogs/Views/Models/DisplayTemplates/BlogPostList.ascx +++ b/src/Orchard.Web/Packages/Orchard.Blogs/Views/Models/DisplayTemplates/BlogPostList.ascx @@ -1,4 +1,4 @@ -<%@ Control Language="C#" Inherits="System.Web.Mvc.ViewUserControl>>" %> +<%@ Control Language="C#" Inherits="System.Web.Mvc.ViewUserControl>>" %> <%@ Import Namespace="Orchard.Mvc.Html"%> <%@ Import Namespace="Orchard.Models.ViewModels"%> <%@ Import Namespace="Orchard.Blogs.Models"%> diff --git a/src/Orchard.Web/Packages/Orchard.Blogs/Views/Models/DisplayTemplates/BlogPostListAdmin.ascx b/src/Orchard.Web/Packages/Orchard.Blogs/Views/Models/DisplayTemplates/BlogPostListAdmin.ascx index 7a6218032..874c1d3f5 100644 --- a/src/Orchard.Web/Packages/Orchard.Blogs/Views/Models/DisplayTemplates/BlogPostListAdmin.ascx +++ b/src/Orchard.Web/Packages/Orchard.Blogs/Views/Models/DisplayTemplates/BlogPostListAdmin.ascx @@ -1,4 +1,4 @@ -<%@ Control Language="C#" Inherits="System.Web.Mvc.ViewUserControl>>" %> +<%@ Control Language="C#" Inherits="System.Web.Mvc.ViewUserControl>>" %> <%@ Import Namespace="Orchard.Mvc.Html"%> <%@ Import Namespace="Orchard.Models.ViewModels"%> <%@ Import Namespace="Orchard.Blogs.Models"%> diff --git a/src/Orchard.Web/Packages/Orchard.Blogs/Views/Models/DisplayTemplates/BlogPostSummary.ascx b/src/Orchard.Web/Packages/Orchard.Blogs/Views/Models/DisplayTemplates/BlogPostSummary.ascx index b331e9cf2..ac1814365 100644 --- a/src/Orchard.Web/Packages/Orchard.Blogs/Views/Models/DisplayTemplates/BlogPostSummary.ascx +++ b/src/Orchard.Web/Packages/Orchard.Blogs/Views/Models/DisplayTemplates/BlogPostSummary.ascx @@ -1,4 +1,4 @@ -<%@ Control Language="C#" Inherits="System.Web.Mvc.ViewUserControl>" %> +<%@ Control Language="C#" Inherits="System.Web.Mvc.ViewUserControl>" %> <%@ Import Namespace="Orchard.Models"%> <%@ Import Namespace="Orchard.Core.Common.Models"%> <%@ Import Namespace="Orchard.Models.ViewModels"%> diff --git a/src/Orchard.Web/Packages/Orchard.Blogs/Views/Models/DisplayTemplates/BlogPostSummaryAdmin.ascx b/src/Orchard.Web/Packages/Orchard.Blogs/Views/Models/DisplayTemplates/BlogPostSummaryAdmin.ascx index f313c5432..a5cadddb8 100644 --- a/src/Orchard.Web/Packages/Orchard.Blogs/Views/Models/DisplayTemplates/BlogPostSummaryAdmin.ascx +++ b/src/Orchard.Web/Packages/Orchard.Blogs/Views/Models/DisplayTemplates/BlogPostSummaryAdmin.ascx @@ -1,4 +1,4 @@ -<%@ Control Language="C#" Inherits="System.Web.Mvc.ViewUserControl>" %> +<%@ Control Language="C#" Inherits="System.Web.Mvc.ViewUserControl>" %> <%@ Import Namespace="Orchard.Models"%> <%@ Import Namespace="Orchard.Core.Common.Models"%> <%@ Import Namespace="Orchard.Models.ViewModels"%> diff --git a/src/Orchard.Web/Packages/Orchard.Blogs/Views/Models/DisplayTemplates/BlogSummary.ascx b/src/Orchard.Web/Packages/Orchard.Blogs/Views/Models/DisplayTemplates/BlogSummary.ascx index d17685899..2c0cd9a2c 100644 --- a/src/Orchard.Web/Packages/Orchard.Blogs/Views/Models/DisplayTemplates/BlogSummary.ascx +++ b/src/Orchard.Web/Packages/Orchard.Blogs/Views/Models/DisplayTemplates/BlogSummary.ascx @@ -1,4 +1,4 @@ -<%@ Control Language="C#" Inherits="System.Web.Mvc.ViewUserControl>" %> +<%@ Control Language="C#" Inherits="System.Web.Mvc.ViewUserControl>" %> <%@ Import Namespace="Orchard.Mvc.Html"%> <%@ Import Namespace="Orchard.Models.ViewModels"%> <%@ Import Namespace="Orchard.Blogs.Extensions"%> diff --git a/src/Orchard.Web/Packages/Orchard.Blogs/Views/Models/DisplayTemplates/BlogSummaryAdmin.ascx b/src/Orchard.Web/Packages/Orchard.Blogs/Views/Models/DisplayTemplates/BlogSummaryAdmin.ascx index 96cae0ffc..6330eddd1 100644 --- a/src/Orchard.Web/Packages/Orchard.Blogs/Views/Models/DisplayTemplates/BlogSummaryAdmin.ascx +++ b/src/Orchard.Web/Packages/Orchard.Blogs/Views/Models/DisplayTemplates/BlogSummaryAdmin.ascx @@ -1,4 +1,4 @@ -<%@ Control Language="C#" Inherits="System.Web.Mvc.ViewUserControl>" %> +<%@ Control Language="C#" Inherits="System.Web.Mvc.ViewUserControl>" %> <%@ Import Namespace="Orchard.Models.ViewModels"%> <%@ Import Namespace="Orchard.Blogs.Extensions"%> <%@ Import Namespace="Orchard.Blogs.Models"%> diff --git a/src/Orchard.Web/Packages/Orchard.Blogs/Views/Models/EditorTemplates/Blog.ascx b/src/Orchard.Web/Packages/Orchard.Blogs/Views/Models/EditorTemplates/Blog.ascx index a69691167..88a4bf383 100644 --- a/src/Orchard.Web/Packages/Orchard.Blogs/Views/Models/EditorTemplates/Blog.ascx +++ b/src/Orchard.Web/Packages/Orchard.Blogs/Views/Models/EditorTemplates/Blog.ascx @@ -1,4 +1,4 @@ -<%@ Control Language="C#" Inherits="System.Web.Mvc.ViewUserControl>" %> +<%@ Control Language="C#" Inherits="System.Web.Mvc.ViewUserControl>" %> <%@ Import Namespace="Orchard.Models.ViewModels"%> <%@ Import Namespace="Orchard.Mvc.Html"%> <%@ Import Namespace="Orchard.Blogs.Models"%> diff --git a/src/Orchard.Web/Packages/Orchard.Blogs/Views/Models/EditorTemplates/BlogPost.ascx b/src/Orchard.Web/Packages/Orchard.Blogs/Views/Models/EditorTemplates/BlogPost.ascx index ef49295ca..b9dd43f6e 100644 --- a/src/Orchard.Web/Packages/Orchard.Blogs/Views/Models/EditorTemplates/BlogPost.ascx +++ b/src/Orchard.Web/Packages/Orchard.Blogs/Views/Models/EditorTemplates/BlogPost.ascx @@ -1,4 +1,4 @@ -<%@ Control Language="C#" Inherits="System.Web.Mvc.ViewUserControl>" %> +<%@ Control Language="C#" Inherits="System.Web.Mvc.ViewUserControl>" %> <%@ Import Namespace="Orchard.Models.ViewModels"%> <%@ Import Namespace="Orchard.Mvc.Html"%> <%@ Import Namespace="Orchard.Blogs.Models"%> diff --git a/src/Orchard.Web/Packages/Orchard.Comments/Models/CommentsHandler.cs b/src/Orchard.Web/Packages/Orchard.Comments/Models/CommentsHandler.cs index 0f65eeb95..bc16a14b5 100644 --- a/src/Orchard.Web/Packages/Orchard.Comments/Models/CommentsHandler.cs +++ b/src/Orchard.Web/Packages/Orchard.Comments/Models/CommentsHandler.cs @@ -19,21 +19,21 @@ namespace Orchard.Comments.Models { Filters.Add(new ActivatingFilter("blogpost")); } - protected override void GetDisplayViewModel(GetDisplayViewModelContext context) { + protected override void BuildDisplayModel(BuildDisplayModelContext context) { if (context.ContentItem.Has() == false) { return; } context.AddDisplay(new TemplateViewModel(context.ContentItem.Get()) { Position = "999" }); } - protected override void GetEditorViewModel(GetEditorViewModelContext context) { + protected override void BuildEditorModel(BuildEditorModelContext context) { if (context.ContentItem.Has() == false) { return; } context.AddEditor(new TemplateViewModel(context.ContentItem.Get())); } - protected override void UpdateEditorViewModel(UpdateEditorViewModelContext context) { + protected override void UpdateEditorModel(UpdateEditorModelContext context) { if (context.ContentItem.Has() == false) { return; } diff --git a/src/Orchard.Web/Packages/Orchard.DevTools/Controllers/ContentController.cs b/src/Orchard.Web/Packages/Orchard.DevTools/Controllers/ContentController.cs index a1b5baac0..162f1b335 100644 --- a/src/Orchard.Web/Packages/Orchard.DevTools/Controllers/ContentController.cs +++ b/src/Orchard.Web/Packages/Orchard.DevTools/Controllers/ContentController.cs @@ -36,8 +36,8 @@ namespace Orchard.DevTools.Controllers { .Select(x => x.GetType()) .SelectMany(x => AllTypes(x)) .Distinct(); - model.DisplayView = _contentManager.GetDisplayViewModel(model.Item, null, null); - model.EditorView = _contentManager.GetEditorViewModel(model.Item, null); + model.DisplayModel = _contentManager.BuildDisplayModel(model.Item, null, null); + model.EditorModel = _contentManager.BuildEditorModel(model.Item, null); return View(model); } diff --git a/src/Orchard.Web/Packages/Orchard.DevTools/Models/DebugLinkHandler.cs b/src/Orchard.Web/Packages/Orchard.DevTools/Models/DebugLinkHandler.cs index 5e0119e37..7c53f14ac 100644 --- a/src/Orchard.Web/Packages/Orchard.DevTools/Models/DebugLinkHandler.cs +++ b/src/Orchard.Web/Packages/Orchard.DevTools/Models/DebugLinkHandler.cs @@ -3,10 +3,10 @@ using Orchard.Models.ViewModels; namespace Orchard.DevTools.Models { public class DebugLinkHandler : ContentHandler { - protected override void GetDisplayViewModel(GetDisplayViewModelContext context) { + protected override void BuildDisplayModel(BuildDisplayModelContext context) { context.AddDisplay(new TemplateViewModel(new ShowDebugLink { ContentItem = context.ContentItem }) { ZoneName = "recap", Position = "9999" }); } - protected override void GetEditorViewModel(GetEditorViewModelContext context) { + protected override void BuildEditorModel(BuildEditorModelContext context) { context.AddEditor(new TemplateViewModel(new ShowDebugLink { ContentItem = context.ContentItem }) { ZoneName = "recap", Position = "9999" }); } } diff --git a/src/Orchard.Web/Packages/Orchard.DevTools/ViewModels/ContentDetailsViewModel.cs b/src/Orchard.Web/Packages/Orchard.DevTools/ViewModels/ContentDetailsViewModel.cs index 97611a0cc..1d19af27a 100644 --- a/src/Orchard.Web/Packages/Orchard.DevTools/ViewModels/ContentDetailsViewModel.cs +++ b/src/Orchard.Web/Packages/Orchard.DevTools/ViewModels/ContentDetailsViewModel.cs @@ -13,13 +13,13 @@ namespace Orchard.DevTools.ViewModels { public IEnumerable PartTypes { get; set; } - public ItemDisplayViewModel DisplayView { get; set; } + public ItemDisplayModel DisplayModel { get; set; } - public ItemEditorViewModel EditorView { get; set; } + public ItemEditorModel EditorModel { get; set; } - public IEnumerable Displays { get { return DisplayView.Displays; } } + public IEnumerable Displays { get { return DisplayModel.Displays; } } - public IEnumerable Editors { get { return EditorView.Editors; } } + public IEnumerable Editors { get { return EditorModel.Editors; } } public object Locate(Type type) { return Item.ContentItem.Get(type); diff --git a/src/Orchard.Web/Packages/Orchard.Media/Models/MediaSettings.cs b/src/Orchard.Web/Packages/Orchard.Media/Models/MediaSettings.cs index b40ec84a7..8ccfae669 100644 --- a/src/Orchard.Web/Packages/Orchard.Media/Models/MediaSettings.cs +++ b/src/Orchard.Web/Packages/Orchard.Media/Models/MediaSettings.cs @@ -23,7 +23,7 @@ namespace Orchard.Media.Models { settings.Record.RootMediaFolder = "~/Media"; } - protected override void GetEditorViewModel(GetEditorViewModelContext context) { + protected override void BuildEditorModel(BuildEditorModelContext context) { var model = context.ContentItem.As(); if (model == null) return; @@ -31,7 +31,7 @@ namespace Orchard.Media.Models { context.AddEditor(new TemplateViewModel(model.Record, "MediaSettings")); } - protected override void UpdateEditorViewModel(UpdateEditorViewModelContext context) { + protected override void UpdateEditorModel(UpdateEditorModelContext context) { var model = context.ContentItem.As(); if (model == null) return; diff --git a/src/Orchard.Web/Packages/Orchard.Roles/Models/UserRolesHandler.cs b/src/Orchard.Web/Packages/Orchard.Roles/Models/UserRolesHandler.cs index 157021bc9..e28f7df6e 100644 --- a/src/Orchard.Web/Packages/Orchard.Roles/Models/UserRolesHandler.cs +++ b/src/Orchard.Web/Packages/Orchard.Roles/Models/UserRolesHandler.cs @@ -29,7 +29,7 @@ namespace Orchard.Roles.Models { }); } - protected override void GetEditorViewModel(GetEditorViewModelContext context) { + protected override void BuildEditorModel(BuildEditorModelContext context) { var userRoles = context.ContentItem.As(); if (userRoles != null) { var roles = @@ -50,7 +50,7 @@ namespace Orchard.Roles.Models { } } - protected override void UpdateEditorViewModel(UpdateEditorViewModelContext context) { + protected override void UpdateEditorModel(UpdateEditorModelContext context) { var userRoles = context.ContentItem.As(); if (userRoles != null) { var viewModel = new UserRolesViewModel(); diff --git a/src/Orchard.Web/Packages/Orchard.Sandbox/Controllers/PageController.cs b/src/Orchard.Web/Packages/Orchard.Sandbox/Controllers/PageController.cs index 8115f9922..4375fafcd 100644 --- a/src/Orchard.Web/Packages/Orchard.Sandbox/Controllers/PageController.cs +++ b/src/Orchard.Web/Packages/Orchard.Sandbox/Controllers/PageController.cs @@ -32,7 +32,7 @@ namespace Orchard.Sandbox.Controllers { Pages = _contentManager.Query() .OrderBy(x => x.Name) .List() - .Select(x => _contentManager.GetDisplayViewModel(x, null, "SummaryList")) + .Select(x => _contentManager.BuildDisplayModel(x, null, "SummaryList")) }; return View(model); } @@ -40,7 +40,7 @@ namespace Orchard.Sandbox.Controllers { public ActionResult Show(int id) { var page = _contentManager.Get(id); var model = new PageShowViewModel { - Page = _contentManager.GetDisplayViewModel(page, null, "Detail") + Page = _contentManager.BuildDisplayModel(page, null, "Detail") }; return View(model); } @@ -80,7 +80,7 @@ namespace Orchard.Sandbox.Controllers { var page = _contentManager.Get(id); var model = new PageEditViewModel { - Page = _contentManager.GetEditorViewModel(page, null) + Page = _contentManager.BuildEditorModel(page, null) }; return View(model); } @@ -95,7 +95,7 @@ namespace Orchard.Sandbox.Controllers { var page = _contentManager.Get(id); var model = new PageEditViewModel { - Page = _contentManager.UpdateEditorViewModel(page, null, this) + Page = _contentManager.UpdateEditorModel(page, null, this) }; if (!ModelState.IsValid) return View(model); diff --git a/src/Orchard.Web/Packages/Orchard.Sandbox/ViewModels/PageEditViewModel.cs b/src/Orchard.Web/Packages/Orchard.Sandbox/ViewModels/PageEditViewModel.cs index 2a7022978..08d7f9fc0 100644 --- a/src/Orchard.Web/Packages/Orchard.Sandbox/ViewModels/PageEditViewModel.cs +++ b/src/Orchard.Web/Packages/Orchard.Sandbox/ViewModels/PageEditViewModel.cs @@ -6,6 +6,6 @@ using Orchard.Sandbox.Models; namespace Orchard.Sandbox.ViewModels { public class PageEditViewModel : BaseViewModel { - public ItemEditorViewModel Page { get; set; } + public ItemEditorModel Page { get; set; } } } diff --git a/src/Orchard.Web/Packages/Orchard.Sandbox/ViewModels/PageIndexViewModel.cs b/src/Orchard.Web/Packages/Orchard.Sandbox/ViewModels/PageIndexViewModel.cs index 5fd9bef8e..a60ada30b 100644 --- a/src/Orchard.Web/Packages/Orchard.Sandbox/ViewModels/PageIndexViewModel.cs +++ b/src/Orchard.Web/Packages/Orchard.Sandbox/ViewModels/PageIndexViewModel.cs @@ -5,6 +5,6 @@ using Orchard.Sandbox.Models; namespace Orchard.Sandbox.ViewModels { public class PageIndexViewModel : BaseViewModel { - public IEnumerable> Pages { get; set; } + public IEnumerable> Pages { get; set; } } } diff --git a/src/Orchard.Web/Packages/Orchard.Sandbox/ViewModels/PageShowViewModel.cs b/src/Orchard.Web/Packages/Orchard.Sandbox/ViewModels/PageShowViewModel.cs index 642b1f22b..6c0c05e9b 100644 --- a/src/Orchard.Web/Packages/Orchard.Sandbox/ViewModels/PageShowViewModel.cs +++ b/src/Orchard.Web/Packages/Orchard.Sandbox/ViewModels/PageShowViewModel.cs @@ -4,6 +4,6 @@ using Orchard.Sandbox.Models; namespace Orchard.Sandbox.ViewModels { public class PageShowViewModel : BaseViewModel { - public ItemDisplayViewModel Page { get; set; } + public ItemDisplayModel Page { get; set; } } } diff --git a/src/Orchard.Web/Packages/Orchard.Sandbox/Views/Models/DisplayTemplates/SandboxPage.ascx b/src/Orchard.Web/Packages/Orchard.Sandbox/Views/Models/DisplayTemplates/SandboxPage.ascx index c8919691e..6bca6ace7 100644 --- a/src/Orchard.Web/Packages/Orchard.Sandbox/Views/Models/DisplayTemplates/SandboxPage.ascx +++ b/src/Orchard.Web/Packages/Orchard.Sandbox/Views/Models/DisplayTemplates/SandboxPage.ascx @@ -1,4 +1,4 @@ -<%@ Control Language="C#" Inherits="System.Web.Mvc.ViewUserControl>" %> +<%@ Control Language="C#" Inherits="System.Web.Mvc.ViewUserControl>" %> <%@ Import Namespace="Orchard.Mvc.Html" %> <%@ Import Namespace="Orchard.Sandbox.Models" %> <%@ Import Namespace="Orchard.Models.ViewModels" %> diff --git a/src/Orchard.Web/Packages/Orchard.Sandbox/Views/Models/DisplayTemplates/SandboxPageSummary.ascx b/src/Orchard.Web/Packages/Orchard.Sandbox/Views/Models/DisplayTemplates/SandboxPageSummary.ascx index 0c7cc49c9..8e241f15a 100644 --- a/src/Orchard.Web/Packages/Orchard.Sandbox/Views/Models/DisplayTemplates/SandboxPageSummary.ascx +++ b/src/Orchard.Web/Packages/Orchard.Sandbox/Views/Models/DisplayTemplates/SandboxPageSummary.ascx @@ -1,4 +1,4 @@ -<%@ Control Language="C#" Inherits="System.Web.Mvc.ViewUserControl>" %> +<%@ Control Language="C#" Inherits="System.Web.Mvc.ViewUserControl>" %> <%@ Import Namespace="Orchard.Mvc.Html"%> <%@ Import Namespace="Orchard.Sandbox.Models" %> <%@ Import Namespace="Orchard.Models.ViewModels" %> diff --git a/src/Orchard.Web/Packages/Orchard.Sandbox/Views/Models/EditorTemplates/SandboxPage.ascx b/src/Orchard.Web/Packages/Orchard.Sandbox/Views/Models/EditorTemplates/SandboxPage.ascx index 93f120797..c279b2ec8 100644 --- a/src/Orchard.Web/Packages/Orchard.Sandbox/Views/Models/EditorTemplates/SandboxPage.ascx +++ b/src/Orchard.Web/Packages/Orchard.Sandbox/Views/Models/EditorTemplates/SandboxPage.ascx @@ -1,4 +1,4 @@ -<%@ Control Language="C#" Inherits="System.Web.Mvc.ViewUserControl>" %> +<%@ Control Language="C#" Inherits="System.Web.Mvc.ViewUserControl>" %> <%@ Import Namespace="Orchard.Mvc.Html" %> <%@ Import Namespace="Orchard.Sandbox.Models" %> <%@ Import Namespace="Orchard.Models.ViewModels" %> diff --git a/src/Orchard.Web/Packages/Orchard.Tags/Controllers/HomeController.cs b/src/Orchard.Web/Packages/Orchard.Tags/Controllers/HomeController.cs index 3ff53a3f7..ae05c1a83 100644 --- a/src/Orchard.Web/Packages/Orchard.Tags/Controllers/HomeController.cs +++ b/src/Orchard.Web/Packages/Orchard.Tags/Controllers/HomeController.cs @@ -102,7 +102,7 @@ namespace Orchard.Tags.Controllers { var tag = _tagService.GetTagByName(tagName); var items = _tagService.GetTaggedContentItems(tag.Id).Select( - ic => _contentManager.GetDisplayViewModel(ic, null, "SummaryForSearch")); + ic => _contentManager.BuildDisplayModel(ic, null, "SummaryForSearch")); var viewModel = new TagsSearchViewModel { TagName = tag.TagName, diff --git a/src/Orchard.Web/Packages/Orchard.Tags/Models/TagsHandler.cs b/src/Orchard.Web/Packages/Orchard.Tags/Models/TagsHandler.cs index dd84e3613..dcdaaa292 100644 --- a/src/Orchard.Web/Packages/Orchard.Tags/Models/TagsHandler.cs +++ b/src/Orchard.Web/Packages/Orchard.Tags/Models/TagsHandler.cs @@ -37,14 +37,14 @@ namespace Orchard.Tags.Models { }); } - protected override void GetEditorViewModel(GetEditorViewModelContext context) { + protected override void BuildEditorModel(BuildEditorModelContext context) { if (context.ContentItem.Has() == false) { return; } context.AddEditor(new TemplateViewModel(context.ContentItem.Get()) { Position = "0" }); } - protected override void UpdateEditorViewModel(UpdateEditorViewModelContext context) { + protected override void UpdateEditorModel(UpdateEditorModelContext context) { if (context.ContentItem.Has() == false) { return; } diff --git a/src/Orchard.Web/Packages/Orchard.Tags/ViewModels/TagsSearchViewModel.cs b/src/Orchard.Web/Packages/Orchard.Tags/ViewModels/TagsSearchViewModel.cs index d63ba8b74..e1d9986bb 100644 --- a/src/Orchard.Web/Packages/Orchard.Tags/ViewModels/TagsSearchViewModel.cs +++ b/src/Orchard.Web/Packages/Orchard.Tags/ViewModels/TagsSearchViewModel.cs @@ -6,6 +6,6 @@ using Orchard.Mvc.ViewModels; namespace Orchard.Tags.ViewModels { public class TagsSearchViewModel : BaseViewModel { public string TagName { get; set; } - public IEnumerable> Items { get; set; } + public IEnumerable> Items { get; set; } } } diff --git a/src/Orchard.Web/Packages/Orchard.Users/Controllers/AdminController.cs b/src/Orchard.Web/Packages/Orchard.Users/Controllers/AdminController.cs index 873955010..66408e1b9 100644 --- a/src/Orchard.Web/Packages/Orchard.Users/Controllers/AdminController.cs +++ b/src/Orchard.Web/Packages/Orchard.Users/Controllers/AdminController.cs @@ -49,7 +49,7 @@ namespace Orchard.Users.Controllers { public ActionResult Create() { var user = _contentManager.New("user"); var model = new UserCreateViewModel { - ItemView = _contentManager.GetEditorViewModel(user, null) + EditorModel = _contentManager.BuildEditorModel(user, null) }; return View(model); } @@ -61,7 +61,7 @@ namespace Orchard.Users.Controllers { ModelState.AddModelError("ConfirmPassword", T("Password confirmation must match").ToString()); } if (ModelState.IsValid == false) { - model.ItemView = _contentManager.UpdateEditorViewModel(_contentManager.New("user"), null, this); + model.EditorModel = _contentManager.UpdateEditorModel(_contentManager.New("user"), null, this); return View(model); } var user = _membershipService.CreateUser(new CreateUserParams( @@ -69,7 +69,7 @@ namespace Orchard.Users.Controllers { model.Password, model.Email, null, null, true)); - model.ItemView = _contentManager.UpdateEditorViewModel(user, null, this); + model.EditorModel = _contentManager.UpdateEditorModel(user, null, this); if (ModelState.IsValid == false) { //TODO: rollback transaction return View(model); @@ -80,14 +80,14 @@ namespace Orchard.Users.Controllers { public ActionResult Edit(int id) { var model = new UserEditViewModel { User = _contentManager.Get(id) }; - model.ItemView = _contentManager.GetEditorViewModel(model.User.ContentItem, null); + model.EditorModel = _contentManager.BuildEditorModel(model.User.ContentItem, null); return View(model); } [HttpPost] public ActionResult Edit(int id, FormCollection input) { var model = new UserEditViewModel { User = _contentManager.Get(id) }; - model.ItemView = _contentManager.UpdateEditorViewModel(model.User.ContentItem, null, this); + model.EditorModel = _contentManager.UpdateEditorModel(model.User.ContentItem, null, this); if (!TryUpdateModel(model, input.ToValueProvider())) { return View(model); diff --git a/src/Orchard.Web/Packages/Orchard.Users/ViewModels/UserCreateViewModel.cs b/src/Orchard.Web/Packages/Orchard.Users/ViewModels/UserCreateViewModel.cs index f1b7529d6..d4a8e4e4e 100644 --- a/src/Orchard.Web/Packages/Orchard.Users/ViewModels/UserCreateViewModel.cs +++ b/src/Orchard.Web/Packages/Orchard.Users/ViewModels/UserCreateViewModel.cs @@ -18,6 +18,6 @@ namespace Orchard.Users.ViewModels { [Required, DataType(DataType.Password)] public string ConfirmPassword { get; set; } - public ItemEditorViewModel ItemView { get; set; } + public ItemEditorModel EditorModel { get; set; } } } \ No newline at end of file diff --git a/src/Orchard.Web/Packages/Orchard.Users/ViewModels/UserEditViewModel.cs b/src/Orchard.Web/Packages/Orchard.Users/ViewModels/UserEditViewModel.cs index 0ac0b8418..ad12f04bd 100644 --- a/src/Orchard.Web/Packages/Orchard.Users/ViewModels/UserEditViewModel.cs +++ b/src/Orchard.Web/Packages/Orchard.Users/ViewModels/UserEditViewModel.cs @@ -1,5 +1,3 @@ -using System; -using System.Collections.Generic; using System.ComponentModel.DataAnnotations; using System.Web.Mvc; using Orchard.Models; @@ -10,7 +8,7 @@ using Orchard.Users.Models; namespace Orchard.Users.ViewModels { public class UserEditViewModel : AdminViewModel { public User User { get; set; } - public ItemEditorViewModel ItemView { get; set; } + public ItemEditorModel EditorModel { get; set; } [HiddenInput(DisplayValue = false)] diff --git a/src/Orchard.Web/Packages/Orchard.Users/Views/Admin/EditorTemplates/UserCreateViewModel.ascx b/src/Orchard.Web/Packages/Orchard.Users/Views/Admin/EditorTemplates/UserCreateViewModel.ascx index 0c856425d..22c62c7d1 100644 --- a/src/Orchard.Web/Packages/Orchard.Users/Views/Admin/EditorTemplates/UserCreateViewModel.ascx +++ b/src/Orchard.Web/Packages/Orchard.Users/Views/Admin/EditorTemplates/UserCreateViewModel.ascx @@ -6,7 +6,7 @@ <%=Html.EditorFor(m=>m.Password, "inputPasswordLarge") %> <%=Html.EditorFor(m=>m.ConfirmPassword, "inputPasswordLarge") %> <% -foreach(var e in Model.ItemView.Editors) { +foreach(var e in Model.EditorModel.Editors) { var editor = e;%>
<%=Html.EditorFor(m => editor.Model, editor.TemplateName, editor.Prefix)%> diff --git a/src/Orchard.Web/Packages/Orchard.Users/Views/Admin/EditorTemplates/UserEditViewModel.ascx b/src/Orchard.Web/Packages/Orchard.Users/Views/Admin/EditorTemplates/UserEditViewModel.ascx index 1cb5f76e8..263498cf8 100644 --- a/src/Orchard.Web/Packages/Orchard.Users/Views/Admin/EditorTemplates/UserEditViewModel.ascx +++ b/src/Orchard.Web/Packages/Orchard.Users/Views/Admin/EditorTemplates/UserEditViewModel.ascx @@ -7,6 +7,6 @@ <%=Html.EditorFor(m=>m.Email, "inputTextLarge") %> -<% foreach(var e in Model.ItemView.Editors) {%> +<% foreach(var e in Model.EditorModel.Editors) {%> <%=Html.EditorFor(m => e.Model, e.TemplateName, e.Prefix)%> <%} %> diff --git a/src/Orchard/Models/DefaultContentManager.cs b/src/Orchard/Models/DefaultContentManager.cs index ed74e0055..021015e68 100644 --- a/src/Orchard/Models/DefaultContentManager.cs +++ b/src/Orchard/Models/DefaultContentManager.cs @@ -136,34 +136,34 @@ namespace Orchard.Models { return context.Metadata; } - public ItemDisplayViewModel GetDisplayViewModel(TContentPart content, string groupName, string displayType) where TContentPart : IContent { - var itemView = new ItemDisplayViewModel {Item = content, Displays = Enumerable.Empty()}; - var context = new GetDisplayViewModelContext(itemView, groupName, displayType); + public ItemDisplayModel BuildDisplayModel(TContentPart content, string groupName, string displayType) where TContentPart : IContent { + var itemView = new ItemDisplayModel {Item = content, Displays = Enumerable.Empty()}; + var context = new BuildDisplayModelContext(itemView, groupName, displayType); foreach (var handler in Handlers) { - handler.GetDisplayViewModel(context); + handler.BuildDisplayModel(context); } - context.ViewModel.Displays = OrderTemplates(context.ViewModel.Displays); + context.DisplayModel.Displays = OrderTemplates(context.DisplayModel.Displays); return itemView; } - public ItemEditorViewModel GetEditorViewModel(TContentPart content, string groupName) where TContentPart : IContent { - var itemView = new ItemEditorViewModel { Item = content, Editors = Enumerable.Empty() }; - var context = new GetEditorViewModelContext(itemView, groupName); + public ItemEditorModel BuildEditorModel(TContentPart content, string groupName) where TContentPart : IContent { + var itemView = new ItemEditorModel { Item = content, Editors = Enumerable.Empty() }; + var context = new BuildEditorModelContext(itemView, groupName); foreach (var handler in Handlers) { - handler.GetEditorViewModel(context); + handler.BuildEditorModel(context); } - context.ViewModel.Editors = OrderTemplates(context.ViewModel.Editors); + context.EditorModel.Editors = OrderTemplates(context.EditorModel.Editors); return itemView; } - public ItemEditorViewModel UpdateEditorViewModel(TContentPart content, string groupName, IUpdateModel updater) where TContentPart : IContent { - var itemView = new ItemEditorViewModel { Item = content, Editors = Enumerable.Empty() }; + public ItemEditorModel UpdateEditorModel(TContentPart content, string groupName, IUpdateModel updater) where TContentPart : IContent { + var itemView = new ItemEditorModel { Item = content, Editors = Enumerable.Empty() }; - var context = new UpdateEditorViewModelContext(itemView, groupName, updater); + var context = new UpdateEditorModelContext(itemView, groupName, updater); foreach (var handler in Handlers) { - handler.UpdateEditorViewModel(context); + handler.UpdateEditorModel(context); } - context.ViewModel.Editors = OrderTemplates(context.ViewModel.Editors); + context.EditorModel.Editors = OrderTemplates(context.EditorModel.Editors); return itemView; } diff --git a/src/Orchard/Models/Driver/GetDisplayViewModelContext.cs b/src/Orchard/Models/Driver/BuildDisplayModelContext.cs similarity index 52% rename from src/Orchard/Models/Driver/GetDisplayViewModelContext.cs rename to src/Orchard/Models/Driver/BuildDisplayModelContext.cs index 0268480c2..2852c598a 100644 --- a/src/Orchard/Models/Driver/GetDisplayViewModelContext.cs +++ b/src/Orchard/Models/Driver/BuildDisplayModelContext.cs @@ -4,22 +4,22 @@ using System.Linq; using Orchard.Models.ViewModels; namespace Orchard.Models.Driver { - public class GetDisplayViewModelContext { - public GetDisplayViewModelContext(ItemDisplayViewModel viewModel, string groupName, string displayType) { - ContentItem = viewModel.Item; + public class BuildDisplayModelContext { + public BuildDisplayModelContext(ItemDisplayModel displayModel, string groupName, string displayType) { + ContentItem = displayModel.Item; GroupName = groupName; DisplayType = displayType; - ViewModel = viewModel; + DisplayModel = displayModel; } public ContentItem ContentItem { get; set; } public string GroupName { get; set; } public string DisplayType { get; set; } - public ItemDisplayViewModel ViewModel { get; set; } + public ItemDisplayModel DisplayModel { get; set; } public void AddDisplay(TemplateViewModel display) { - ViewModel.Displays = ViewModel.Displays.Concat(new[] { display }); + DisplayModel.Displays = DisplayModel.Displays.Concat(new[] { display }); } } } diff --git a/src/Orchard/Models/Driver/BuildEditorModelContext.cs b/src/Orchard/Models/Driver/BuildEditorModelContext.cs new file mode 100644 index 000000000..cb4242fc1 --- /dev/null +++ b/src/Orchard/Models/Driver/BuildEditorModelContext.cs @@ -0,0 +1,22 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using Orchard.Models.ViewModels; + +namespace Orchard.Models.Driver { + public class BuildEditorModelContext { + public BuildEditorModelContext(ItemEditorModel editorModel, string groupName) { + ContentItem = editorModel.Item; + GroupName = groupName; + EditorModel = editorModel; + } + + public ContentItem ContentItem { get; set; } + public string GroupName { get; set; } + public ItemEditorModel EditorModel { get; set; } + + public void AddEditor(TemplateViewModel editor) { + EditorModel.Editors = EditorModel.Editors.Concat(new[] { editor }); + } + } +} \ No newline at end of file diff --git a/src/Orchard/Models/Driver/ContentHandler.cs b/src/Orchard/Models/Driver/ContentHandler.cs index 3e04f46d5..2deb66ed2 100644 --- a/src/Orchard/Models/Driver/ContentHandler.cs +++ b/src/Orchard/Models/Driver/ContentHandler.cs @@ -36,15 +36,15 @@ namespace Orchard.Models.Driver { protected void OnGetItemMetadata(Action handler) where TPart : class, IContent { Filters.Add(new InlineTemplateFilter { OnGetItemMetadata = handler }); } - protected void OnGetDisplayViewModel(Action handler) where TPart : class, IContent { + protected void OnGetDisplayViewModel(Action handler) where TPart : class, IContent { Filters.Add(new InlineTemplateFilter { OnGetDisplayViewModel = handler }); } - protected void OnGetEditorViewModel(Action handler) where TPart : class, IContent { + protected void OnGetEditorViewModel(Action handler) where TPart : class, IContent { Filters.Add(new InlineTemplateFilter { OnGetEditorViewModel = handler }); } - protected void OnUpdateEditorViewModel(Action handler) where TPart : class, IContent { + protected void OnUpdateEditorViewModel(Action handler) where TPart : class, IContent { Filters.Add(new InlineTemplateFilter { OnUpdateEditorViewModel = handler }); } @@ -73,19 +73,19 @@ namespace Orchard.Models.Driver { class InlineTemplateFilter : TemplateFilterBase where TPart : class, IContent { public Action OnGetItemMetadata { get; set; } - public Action OnGetDisplayViewModel { get; set; } - public Action OnGetEditorViewModel { get; set; } - public Action OnUpdateEditorViewModel { get; set; } + public Action OnGetDisplayViewModel { get; set; } + public Action OnGetEditorViewModel { get; set; } + public Action OnUpdateEditorViewModel { get; set; } protected override void GetItemMetadata(GetItemMetadataContext context, TPart instance) { if (OnGetItemMetadata != null) OnGetItemMetadata(context, instance); } - protected override void GetDisplayViewModel(GetDisplayViewModelContext context, TPart instance) { + protected override void BuildDisplayModel(BuildDisplayModelContext context, TPart instance) { if (OnGetDisplayViewModel != null) OnGetDisplayViewModel(context, instance); } - protected override void GetEditorViewModel(GetEditorViewModelContext context, TPart instance) { + protected override void BuildEditorModel(BuildEditorModelContext context, TPart instance) { if (OnGetEditorViewModel != null) OnGetEditorViewModel(context, instance); } - protected override void UpdateEditorViewModel(UpdateEditorViewModelContext context, TPart instance) { + protected override void UpdateEditorModel(UpdateEditorModelContext context, TPart instance) { if (OnUpdateEditorViewModel != null) OnUpdateEditorViewModel(context, instance); } } @@ -136,20 +136,20 @@ namespace Orchard.Models.Driver { filter.GetItemMetadata(context); GetItemMetadata(context); } - void IContentHandler.GetDisplayViewModel(GetDisplayViewModelContext context) { + void IContentHandler.BuildDisplayModel(BuildDisplayModelContext context) { foreach (var filter in Filters.OfType()) - filter.GetDisplayViewModel(context); - GetDisplayViewModel(context); + filter.BuildDisplayModel(context); + BuildDisplayModel(context); } - void IContentHandler.GetEditorViewModel(GetEditorViewModelContext context) { + void IContentHandler.BuildEditorModel(BuildEditorModelContext context) { foreach (var filter in Filters.OfType()) - filter.GetEditorViewModel(context); - GetEditorViewModel(context); + filter.BuildEditorModel(context); + BuildEditorModel(context); } - void IContentHandler.UpdateEditorViewModel(UpdateEditorViewModelContext context) { + void IContentHandler.UpdateEditorModel(UpdateEditorModelContext context) { foreach (var filter in Filters.OfType()) - filter.UpdateEditorViewModel(context); - UpdateEditorViewModel(context); + filter.UpdateEditorModel(context); + UpdateEditorModel(context); } protected virtual void Activating(ActivatingContentContext context) { } @@ -162,8 +162,8 @@ namespace Orchard.Models.Driver { protected virtual void Created(CreateContentContext context) { } protected virtual void GetItemMetadata(GetItemMetadataContext context) { } - protected virtual void GetDisplayViewModel(GetDisplayViewModelContext context) { } - protected virtual void GetEditorViewModel(GetEditorViewModelContext context) { } - protected virtual void UpdateEditorViewModel(UpdateEditorViewModelContext context) {} + protected virtual void BuildDisplayModel(BuildDisplayModelContext context) { } + protected virtual void BuildEditorModel(BuildEditorModelContext context) { } + protected virtual void UpdateEditorModel(UpdateEditorModelContext context) {} } } \ No newline at end of file diff --git a/src/Orchard/Models/Driver/ContentItemTemplates.cs b/src/Orchard/Models/Driver/ContentItemTemplates.cs index 7d6783bdd..496937e0f 100644 --- a/src/Orchard/Models/Driver/ContentItemTemplates.cs +++ b/src/Orchard/Models/Driver/ContentItemTemplates.cs @@ -8,7 +8,7 @@ namespace Orchard.Models.Driver { private readonly string _templateName; private readonly string _prefix; private readonly string[] _displayTypes; - private Action> _updater; + private Action> _updater; public ContentItemTemplates(string templateName, params string[] displayTypes) { _templateName = templateName; @@ -16,16 +16,16 @@ namespace Orchard.Models.Driver { _updater = (context, viewModel) => context.Updater.TryUpdateModel(viewModel, "", null, null); } - protected override void GetDisplayViewModel(GetDisplayViewModelContext context, TContent instance) { + protected override void BuildDisplayModel(BuildDisplayModelContext context, TContent instance) { var longestMatch = LongestMatch(context.DisplayType); - context.ViewModel.TemplateName = _templateName + longestMatch; - context.ViewModel.Prefix = _prefix; + context.DisplayModel.TemplateName = _templateName + longestMatch; + context.DisplayModel.Prefix = _prefix; - if (context.ViewModel.GetType() != typeof(ItemDisplayViewModel)) { - context.ViewModel.Adaptor = (html, viewModel) => { - return new HtmlHelper>( + if (context.DisplayModel.GetType() != typeof(ItemDisplayModel)) { + context.DisplayModel.Adaptor = (html, viewModel) => { + return new HtmlHelper>( html.ViewContext, - new ViewDataContainer { ViewData = new ViewDataDictionary(new ItemDisplayViewModel(viewModel)) }, + new ViewDataContainer { ViewData = new ViewDataDictionary(new ItemDisplayModel(viewModel)) }, html.RouteCollection); }; } @@ -45,18 +45,29 @@ namespace Orchard.Models.Driver { }); } - protected override void GetEditorViewModel(GetEditorViewModelContext context, TContent instance) { - context.ViewModel.TemplateName = _templateName; - context.ViewModel.Prefix = _prefix; + protected override void BuildEditorModel(BuildEditorModelContext context, TContent instance) { + context.EditorModel.TemplateName = _templateName; + context.EditorModel.Prefix = _prefix; + if (context.EditorModel.GetType() != typeof(ItemEditorModel)) { + context.EditorModel.Adaptor = (html, viewModel) => { + return new HtmlHelper>( + html.ViewContext, + new ViewDataContainer { ViewData = new ViewDataDictionary(new ItemEditorModel(viewModel)) }, + html.RouteCollection); + }; + } } - protected override void UpdateEditorViewModel(UpdateEditorViewModelContext context, TContent instance) { - _updater(context, (ItemEditorViewModel)context.ViewModel); - context.ViewModel.TemplateName = _templateName; - context.ViewModel.Prefix = _prefix; + protected override void UpdateEditorModel(UpdateEditorModelContext context, TContent instance) { + if (context.EditorModel is ItemEditorModel) + _updater(context, (ItemEditorModel)context.EditorModel); + else + _updater(context, new ItemEditorModel(context.EditorModel)); + context.EditorModel.TemplateName = _templateName; + context.EditorModel.Prefix = _prefix; } - public void Updater(Action> updater) { + public void Updater(Action> updater) { _updater = updater; } } diff --git a/src/Orchard/Models/Driver/GetEditorViewModelContext.cs b/src/Orchard/Models/Driver/GetEditorViewModelContext.cs deleted file mode 100644 index 8f00600fb..000000000 --- a/src/Orchard/Models/Driver/GetEditorViewModelContext.cs +++ /dev/null @@ -1,22 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using Orchard.Models.ViewModels; - -namespace Orchard.Models.Driver { - public class GetEditorViewModelContext { - public GetEditorViewModelContext(ItemEditorViewModel viewModel, string groupName) { - ContentItem = viewModel.Item; - GroupName = groupName; - ViewModel = viewModel; - } - - public ContentItem ContentItem { get; set; } - public string GroupName { get; set; } - public ItemEditorViewModel ViewModel { get; set; } - - public void AddEditor(TemplateViewModel editor) { - ViewModel.Editors = ViewModel.Editors.Concat(new[] { editor }); - } - } -} \ No newline at end of file diff --git a/src/Orchard/Models/Driver/IContentHandler.cs b/src/Orchard/Models/Driver/IContentHandler.cs index 8b3e8e868..0c38eb563 100644 --- a/src/Orchard/Models/Driver/IContentHandler.cs +++ b/src/Orchard/Models/Driver/IContentHandler.cs @@ -12,8 +12,8 @@ namespace Orchard.Models.Driver { void Loaded(LoadContentContext context); void GetItemMetadata(GetItemMetadataContext context); - void GetDisplayViewModel(GetDisplayViewModelContext context); - void GetEditorViewModel(GetEditorViewModelContext context); - void UpdateEditorViewModel(UpdateEditorViewModelContext context); + void BuildDisplayModel(BuildDisplayModelContext context); + void BuildEditorModel(BuildEditorModelContext context); + void UpdateEditorModel(UpdateEditorModelContext context); } } diff --git a/src/Orchard/Models/Driver/IContentTemplateFilter.cs b/src/Orchard/Models/Driver/IContentTemplateFilter.cs index e213eba6d..833750f71 100644 --- a/src/Orchard/Models/Driver/IContentTemplateFilter.cs +++ b/src/Orchard/Models/Driver/IContentTemplateFilter.cs @@ -6,8 +6,8 @@ using System.Text; namespace Orchard.Models.Driver { interface IContentTemplateFilter : IContentFilter { void GetItemMetadata(GetItemMetadataContext context); - void GetDisplayViewModel(GetDisplayViewModelContext context); - void GetEditorViewModel(GetEditorViewModelContext context); - void UpdateEditorViewModel(UpdateEditorViewModelContext context); + void BuildDisplayModel(BuildDisplayModelContext context); + void BuildEditorModel(BuildEditorModelContext context); + void UpdateEditorModel(UpdateEditorModelContext context); } } diff --git a/src/Orchard/Models/Driver/TemplateFilterBase.cs b/src/Orchard/Models/Driver/TemplateFilterBase.cs index 68b2f63c1..4a6f0ebf4 100644 --- a/src/Orchard/Models/Driver/TemplateFilterBase.cs +++ b/src/Orchard/Models/Driver/TemplateFilterBase.cs @@ -7,28 +7,28 @@ namespace Orchard.Models.Driver { public abstract class TemplateFilterBase : IContentTemplateFilter where TPart : class, IContent { protected virtual void GetItemMetadata(GetItemMetadataContext context, TPart instance) { } - protected virtual void GetDisplayViewModel(GetDisplayViewModelContext context, TPart instance) { } - protected virtual void GetEditorViewModel(GetEditorViewModelContext context, TPart instance) { } - protected virtual void UpdateEditorViewModel(UpdateEditorViewModelContext context, TPart instance) { } + protected virtual void BuildDisplayModel(BuildDisplayModelContext context, TPart instance) { } + protected virtual void BuildEditorModel(BuildEditorModelContext context, TPart instance) { } + protected virtual void UpdateEditorModel(UpdateEditorModelContext context, TPart instance) { } void IContentTemplateFilter.GetItemMetadata(GetItemMetadataContext context) { if (context.ContentItem.Is()) GetItemMetadata(context, context.ContentItem.As()); } - void IContentTemplateFilter.GetDisplayViewModel(GetDisplayViewModelContext context) { + void IContentTemplateFilter.BuildDisplayModel(BuildDisplayModelContext context) { if (context.ContentItem.Is()) - GetDisplayViewModel(context, context.ContentItem.As()); + BuildDisplayModel(context, context.ContentItem.As()); } - void IContentTemplateFilter.GetEditorViewModel(GetEditorViewModelContext context) { + void IContentTemplateFilter.BuildEditorModel(BuildEditorModelContext context) { if (context.ContentItem.Is()) - GetEditorViewModel(context, context.ContentItem.As()); + BuildEditorModel(context, context.ContentItem.As()); } - void IContentTemplateFilter.UpdateEditorViewModel(UpdateEditorViewModelContext context) { + void IContentTemplateFilter.UpdateEditorModel(UpdateEditorModelContext context) { if (context.ContentItem.Is()) - UpdateEditorViewModel(context, context.ContentItem.As()); + UpdateEditorModel(context, context.ContentItem.As()); } } diff --git a/src/Orchard/Models/Driver/TemplateFilterForRecord.cs b/src/Orchard/Models/Driver/TemplateFilterForRecord.cs index 6cc2b971f..7bc21def1 100644 --- a/src/Orchard/Models/Driver/TemplateFilterForRecord.cs +++ b/src/Orchard/Models/Driver/TemplateFilterForRecord.cs @@ -9,11 +9,11 @@ namespace Orchard.Models.Driver { _prefix = prefix; } - protected override void GetEditorViewModel(GetEditorViewModelContext context, ContentPart part) { + protected override void BuildEditorModel(BuildEditorModelContext context, ContentPart part) { context.AddEditor(new TemplateViewModel(part.Record, _prefix)); } - protected override void UpdateEditorViewModel(UpdateEditorViewModelContext context, ContentPart part) { + protected override void UpdateEditorModel(UpdateEditorModelContext context, ContentPart part) { context.Updater.TryUpdateModel(part.Record, _prefix, null, null); context.AddEditor(new TemplateViewModel(part.Record, _prefix)); } diff --git a/src/Orchard/Models/Driver/UpdateEditorModelContext.cs b/src/Orchard/Models/Driver/UpdateEditorModelContext.cs new file mode 100644 index 000000000..ab4585dc9 --- /dev/null +++ b/src/Orchard/Models/Driver/UpdateEditorModelContext.cs @@ -0,0 +1,12 @@ +using Orchard.Models.ViewModels; + +namespace Orchard.Models.Driver { + public class UpdateEditorModelContext : BuildEditorModelContext { + public UpdateEditorModelContext(ItemEditorModel editorModel, string groupName, IUpdateModel updater) + : base(editorModel, groupName) { + Updater = updater; + } + + public IUpdateModel Updater { get; set; } + } +} \ No newline at end of file diff --git a/src/Orchard/Models/Driver/UpdateEditorViewModelContext.cs b/src/Orchard/Models/Driver/UpdateEditorViewModelContext.cs deleted file mode 100644 index dc3b3e667..000000000 --- a/src/Orchard/Models/Driver/UpdateEditorViewModelContext.cs +++ /dev/null @@ -1,12 +0,0 @@ -using Orchard.Models.ViewModels; - -namespace Orchard.Models.Driver { - public class UpdateEditorViewModelContext : GetEditorViewModelContext { - public UpdateEditorViewModelContext(ItemEditorViewModel viewModel, string groupName, IUpdateModel updater) - : base(viewModel, groupName) { - Updater = updater; - } - - public IUpdateModel Updater { get; set; } - } -} \ No newline at end of file diff --git a/src/Orchard/Models/IContentManager.cs b/src/Orchard/Models/IContentManager.cs index d1ac1c895..3be5edcf2 100644 --- a/src/Orchard/Models/IContentManager.cs +++ b/src/Orchard/Models/IContentManager.cs @@ -16,8 +16,8 @@ namespace Orchard.Models { ContentItemMetadata GetItemMetadata(IContent contentItem); - ItemDisplayViewModel GetDisplayViewModel(TContent content, string groupName, string displayType) where TContent : IContent; - ItemEditorViewModel GetEditorViewModel(TContent content, string groupName) where TContent : IContent; - ItemEditorViewModel UpdateEditorViewModel(TContent content, string groupName, IUpdateModel updater) where TContent : IContent; + ItemDisplayModel BuildDisplayModel(TContent content, string groupName, string displayType) where TContent : IContent; + ItemEditorModel BuildEditorModel(TContent content, string groupName) where TContent : IContent; + ItemEditorModel UpdateEditorModel(TContent content, string groupName, IUpdateModel updater) where TContent : IContent; } } diff --git a/src/Orchard/Models/Records/ContentPartRecord.cs b/src/Orchard/Models/Records/ContentPartRecord.cs index 613beb190..c7c498dbd 100644 --- a/src/Orchard/Models/Records/ContentPartRecord.cs +++ b/src/Orchard/Models/Records/ContentPartRecord.cs @@ -1,5 +1,5 @@ namespace Orchard.Models.Records { - public abstract class ContentPartRecord : ContentPart { + public abstract class ContentPartRecord { public virtual int Id { get; set; } public virtual ContentItemRecord ContentItemRecord { get; set; } } diff --git a/src/Orchard/Models/Records/ContentPartRecordAlteration.cs b/src/Orchard/Models/Records/ContentPartRecordAlteration.cs index 6e3c72e9a..6c1b4a679 100644 --- a/src/Orchard/Models/Records/ContentPartRecordAlteration.cs +++ b/src/Orchard/Models/Records/ContentPartRecordAlteration.cs @@ -28,8 +28,7 @@ namespace Orchard.Models.Records { public void Override(object mappingObj) { var mapping = (AutoMapping)mappingObj; mapping.Id(x => x.Id).GeneratedBy.Foreign("ContentItemRecord"); - mapping.HasOne(x => x.ContentItemRecord).Constrained(); - mapping.IgnoreProperty(x => x.ContentItem); + mapping.HasOne(x => x.ContentItemRecord).Constrained(); } } } diff --git a/src/Orchard/Models/ViewModels/ItemDisplayViewModel.cs b/src/Orchard/Models/ViewModels/ItemDisplayModel.cs similarity index 54% rename from src/Orchard/Models/ViewModels/ItemDisplayViewModel.cs rename to src/Orchard/Models/ViewModels/ItemDisplayModel.cs index 03ac56708..53f8cd824 100644 --- a/src/Orchard/Models/ViewModels/ItemDisplayViewModel.cs +++ b/src/Orchard/Models/ViewModels/ItemDisplayModel.cs @@ -4,20 +4,20 @@ using System.Linq; using System.Web.Mvc; namespace Orchard.Models.ViewModels { - public class ItemDisplayViewModel { + public class ItemDisplayModel { private ContentItem _item; - protected ItemDisplayViewModel() { + protected ItemDisplayModel() { } - protected ItemDisplayViewModel(ItemDisplayViewModel viewModel) { - TemplateName = viewModel.TemplateName; - Prefix = viewModel.Prefix; - Displays = viewModel.Displays.ToArray(); - Item = viewModel.Item; + protected ItemDisplayModel(ItemDisplayModel displayModel) { + TemplateName = displayModel.TemplateName; + Prefix = displayModel.Prefix; + Displays = displayModel.Displays.ToArray(); + Item = displayModel.Item; } - public ItemDisplayViewModel(ContentItem item) { + public ItemDisplayModel(ContentItem item) { Item = item; } @@ -30,20 +30,20 @@ namespace Orchard.Models.ViewModels { _item = value; } - public Func Adaptor { get; set; } + public Func Adaptor { get; set; } public string TemplateName { get; set; } public string Prefix { get; set; } public IEnumerable Displays { get; set; } } - public class ItemDisplayViewModel : ItemDisplayViewModel where TPart : IContent { + public class ItemDisplayModel : ItemDisplayModel where TPart : IContent { private TPart _item; - public ItemDisplayViewModel() { + public ItemDisplayModel() { } - public ItemDisplayViewModel(ItemDisplayViewModel viewModel) - : base(viewModel) { + public ItemDisplayModel(ItemDisplayModel displayModel) + : base(displayModel) { } public new TPart Item { diff --git a/src/Orchard/Models/ViewModels/ItemEditorViewModel.cs b/src/Orchard/Models/ViewModels/ItemEditorModel.cs similarity index 50% rename from src/Orchard/Models/ViewModels/ItemEditorViewModel.cs rename to src/Orchard/Models/ViewModels/ItemEditorModel.cs index 1d4cd3d11..60638f5c3 100644 --- a/src/Orchard/Models/ViewModels/ItemEditorViewModel.cs +++ b/src/Orchard/Models/ViewModels/ItemEditorModel.cs @@ -1,8 +1,22 @@ +using System; using System.Collections.Generic; +using System.Linq; +using System.Web.Mvc; namespace Orchard.Models.ViewModels { - public class ItemEditorViewModel { + public class ItemEditorModel { private ContentItem _item; + + protected ItemEditorModel() { + } + + protected ItemEditorModel(ItemEditorModel editorModel) { + TemplateName = editorModel.TemplateName; + Prefix = editorModel.Prefix; + Editors = editorModel.Editors.ToArray(); + Item = editorModel.Item; + } + public ContentItem Item { get { return _item; } set { SetItem(value); } @@ -12,14 +26,23 @@ namespace Orchard.Models.ViewModels { _item = value; } + public Func Adaptor { get; set; } public string TemplateName { get; set; } public string Prefix { get; set; } - public IEnumerable Editors { get; set; } } - public class ItemEditorViewModel : ItemEditorViewModel where TPart : IContent { + public class ItemEditorModel : ItemEditorModel where TPart : IContent { private TPart _item; + + + public ItemEditorModel() { + + } + public ItemEditorModel(ItemEditorModel editorModel) + : base(editorModel) { + } + public new TPart Item { get { return _item; } set { SetItem(value.ContentItem); } @@ -30,4 +53,4 @@ namespace Orchard.Models.ViewModels { base.SetItem(value); } } -} \ No newline at end of file +} diff --git a/src/Orchard/Mvc/Html/ContentItemExtensions.cs b/src/Orchard/Mvc/Html/ContentItemExtensions.cs index e41b00bb9..639cf9f7c 100644 --- a/src/Orchard/Mvc/Html/ContentItemExtensions.cs +++ b/src/Orchard/Mvc/Html/ContentItemExtensions.cs @@ -45,7 +45,7 @@ namespace Orchard.Mvc.Html { } public static MvcHtmlString ItemDisplayTemplate(this HtmlHelper html, IContent content, string template) { - return html.Partial(string.Format("{0}/{1}", content.ContentItem.ContentType, template), new ItemDisplayViewModel(content.ContentItem)); + return html.Partial(string.Format("{0}/{1}", content.ContentItem.ContentType, template), new ItemDisplayModel(content.ContentItem)); } } } diff --git a/src/Orchard/Mvc/Html/ItemDisplayExtensions.cs b/src/Orchard/Mvc/Html/ItemDisplayExtensions.cs index 8b73c5be9..56d41b249 100644 --- a/src/Orchard/Mvc/Html/ItemDisplayExtensions.cs +++ b/src/Orchard/Mvc/Html/ItemDisplayExtensions.cs @@ -8,10 +8,10 @@ using Orchard.Models.ViewModels; namespace Orchard.Mvc.Html { public static class ItemDisplayExtensions { - public static MvcHtmlString DisplayForItem(this HtmlHelper html, TItemViewModel itemViewModel) where TItemViewModel : ItemDisplayViewModel { + public static MvcHtmlString DisplayForItem(this HtmlHelper html, TItemViewModel itemViewModel) where TItemViewModel : ItemDisplayModel { return html.DisplayForItem(x => itemViewModel); } - public static MvcHtmlString DisplayForItem(this HtmlHelper html, Expression> expression) where TItemViewModel : ItemDisplayViewModel { + public static MvcHtmlString DisplayForItem(this HtmlHelper html, Expression> expression) where TItemViewModel : ItemDisplayModel { var metadata = ModelMetadata.FromLambdaExpression(expression, html.ViewData); var model = (TItemViewModel)metadata.Model; @@ -24,22 +24,22 @@ namespace Orchard.Mvc.Html { } - public static MvcHtmlString DisplayZone(this HtmlHelper html, string zoneName) where TModel : ItemDisplayViewModel { + public static MvcHtmlString DisplayZone(this HtmlHelper html, string zoneName) where TModel : ItemDisplayModel { var templates = html.ViewData.Model.Displays.Where(x => x.ZoneName == zoneName && x.WasUsed == false); return DisplayZoneImplementation(html, templates); } - public static MvcHtmlString DisplayZonesAny(this HtmlHelper html) where TModel : ItemDisplayViewModel { + public static MvcHtmlString DisplayZonesAny(this HtmlHelper html) where TModel : ItemDisplayModel { var templates = html.ViewData.Model.Displays.Where(x => x.WasUsed == false); return DisplayZoneImplementation(html, templates); } - public static MvcHtmlString DisplayZones(this HtmlHelper html, params string[] include) where TModel : ItemDisplayViewModel { + public static MvcHtmlString DisplayZones(this HtmlHelper html, params string[] include) where TModel : ItemDisplayModel { var templates = html.ViewData.Model.Displays.Where(x => include.Contains(x.ZoneName) && x.WasUsed == false); return DisplayZoneImplementation(html, templates); } - public static MvcHtmlString DisplayZonesExcept(this HtmlHelper html, params string[] exclude) where TModel : ItemDisplayViewModel { + public static MvcHtmlString DisplayZonesExcept(this HtmlHelper html, params string[] exclude) where TModel : ItemDisplayModel { var templates = html.ViewData.Model.Displays.Where(x => !exclude.Contains(x.ZoneName) && x.WasUsed == false); return DisplayZoneImplementation(html, templates); } diff --git a/src/Orchard/Mvc/Html/ItemEditorExtensions.cs b/src/Orchard/Mvc/Html/ItemEditorExtensions.cs index 665e3ffc8..c9f58d3ac 100644 --- a/src/Orchard/Mvc/Html/ItemEditorExtensions.cs +++ b/src/Orchard/Mvc/Html/ItemEditorExtensions.cs @@ -8,31 +8,35 @@ using Orchard.Models.ViewModels; namespace Orchard.Mvc.Html { public static class ItemEditorExtensions { - public static MvcHtmlString EditorForItem(this HtmlHelper html, Expression> expression) where TItemViewModel : ItemEditorViewModel { + public static MvcHtmlString EditorForItem(this HtmlHelper html, Expression> expression) where TItemViewModel : ItemEditorModel { var metadata = ModelMetadata.FromLambdaExpression(expression, html.ViewData); var model = (TItemViewModel)metadata.Model; + if (model.Adaptor != null) { + return model.Adaptor(html, model).EditorForModel(model.TemplateName, model.Prefix ?? ""); + } + return html.EditorFor(expression, model.TemplateName, model.Prefix ?? ""); } - public static MvcHtmlString EditorZone(this HtmlHelper html, string zoneName) where TModel : ItemEditorViewModel { + public static MvcHtmlString EditorZone(this HtmlHelper html, string zoneName) where TModel : ItemEditorModel { var templates = html.ViewData.Model.Editors.Where(x => x.ZoneName == zoneName && x.WasUsed == false); return EditorZoneImplementation(html, templates); } - public static MvcHtmlString EditorZonesAny(this HtmlHelper html) where TModel : ItemEditorViewModel { + public static MvcHtmlString EditorZonesAny(this HtmlHelper html) where TModel : ItemEditorModel { var templates = html.ViewData.Model.Editors.Where(x => x.WasUsed == false); return EditorZoneImplementation(html, templates); } - public static MvcHtmlString EditorZones(this HtmlHelper html, params string[] include) where TModel : ItemEditorViewModel { + public static MvcHtmlString EditorZones(this HtmlHelper html, params string[] include) where TModel : ItemEditorModel { var templates = html.ViewData.Model.Editors.Where(x => include.Contains(x.ZoneName) && x.WasUsed == false); return EditorZoneImplementation(html, templates); } - public static MvcHtmlString EditorZonesExcept(this HtmlHelper html, params string[] exclude) where TModel : ItemEditorViewModel { + public static MvcHtmlString EditorZonesExcept(this HtmlHelper html, params string[] exclude) where TModel : ItemEditorModel { var templates = html.ViewData.Model.Editors.Where(x => !exclude.Contains(x.ZoneName) && x.WasUsed == false); return EditorZoneImplementation(html, templates); } diff --git a/src/Orchard/Orchard.csproj b/src/Orchard/Orchard.csproj index 8f0cacf32..b9c8e162b 100644 --- a/src/Orchard/Orchard.csproj +++ b/src/Orchard/Orchard.csproj @@ -144,7 +144,7 @@ - + @@ -166,7 +166,7 @@ - + @@ -183,10 +183,10 @@ - + - - + +