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

Renaming methods to BuildDisplayModel, BuildEditorModel, UpdateEditorModel and models to ItemDisplayModel, ItemEditorModel

Browse Source 
--HG--
extra : convert_revision : svn%3A5ff7c347-ad56-4c35-b696-ccb81de16e03/trunk%4043654
This commit is contained in:
loudej
2009-12-10 04:19:54 +00:00
parent e8ba2bbcd5
commit 50ff33c386
70 changed files with 266 additions and 231 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/Orchard.Web/Core/Common/Providers/CommonAspectHandler.cs
View File

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

4
src/Orchard.Web/Core/Settings/Controllers/AdminController.cs
View File

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

2
src/Orchard.Web/Core/Settings/ViewModels/SettingsIndexViewModel.cs
View File

@@ -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)]

2
src/Orchard.Web/Core/Settings/Views/Admin/EditorTemplates/SettingsIndexViewModel.ascx
View File

@@ -18,6 +18,6 @@
</ol>
<% foreach(var e in Model.ItemView.Editors) {%>
<% foreach(var e in Model.EditorModel.Editors) {%>
<%=Html.EditorFor(m => e.Model, e.TemplateName, e.Prefix)%>
<%} %>

16
src/Orchard.Web/Packages/Orchard.Blogs/Controllers/BlogController.cs
View File

@@ -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>("blog"), null, this);
model.Blog = _contentManager.UpdateEditorModel(_contentManager.New<Blog>("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)

10
src/Orchard.Web/Packages/Orchard.Blogs/Controllers/BlogPostController.cs
View File

@@ -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>("blogpost"), null);
var blogPost = _contentManager.BuildEditorModel(_contentManager.New<BlogPost>("blogpost"), null);
blogPost.Item.Blog = blog;
var model = new CreateBlogPostViewModel {
@@ -116,7 +116,7 @@ namespace Orchard.Blogs.Controllers {
BlogPost blogPost = _contentManager.New<BlogPost>("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);

4
src/Orchard.Web/Packages/Orchard.Blogs/Models/BlogPostHandler.cs
View File

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

2
src/Orchard.Web/Packages/Orchard.Blogs/ViewModels/BlogEditViewModel.cs
View File

@@ -4,6 +4,6 @@ using Orchard.Mvc.ViewModels;
namespace Orchard.Blogs.ViewModels {
public class BlogEditViewModel : AdminViewModel {
public ItemEditorViewModel<Blog> Blog { get; set; }
public ItemEditorModel<Blog> Blog { get; set; }
}
}

2
src/Orchard.Web/Packages/Orchard.Blogs/ViewModels/BlogForAdminViewModel.cs
View File

@@ -4,6 +4,6 @@ using Orchard.Mvc.ViewModels;
namespace Orchard.Blogs.ViewModels {
public class BlogForAdminViewModel : AdminViewModel {
public ItemDisplayViewModel<Blog> Blog { get; set; }
public ItemDisplayModel<Blog> Blog { get; set; }
}
}

2
src/Orchard.Web/Packages/Orchard.Blogs/ViewModels/BlogPostEditViewModel.cs
View File

@@ -5,6 +5,6 @@ using Orchard.Mvc.ViewModels;
namespace Orchard.Blogs.ViewModels {
public class BlogPostEditViewModel : AdminViewModel {
public Blog Blog { get; set; }
public ItemEditorViewModel<BlogPost> BlogPost { get; set; }
public ItemEditorModel<BlogPost> BlogPost { get; set; }
}
}

2
src/Orchard.Web/Packages/Orchard.Blogs/ViewModels/BlogPostViewModel.cs
View File

@@ -5,6 +5,6 @@ using Orchard.Mvc.ViewModels;
namespace Orchard.Blogs.ViewModels {
public class BlogPostViewModel : BaseViewModel {
public Blog Blog { get; set; }
public ItemDisplayViewModel<BlogPost> BlogPost { get; set; }
public ItemDisplayModel<BlogPost> BlogPost { get; set; }
}
}

2
src/Orchard.Web/Packages/Orchard.Blogs/ViewModels/BlogViewModel.cs
View File

@@ -4,6 +4,6 @@ using Orchard.Mvc.ViewModels;
namespace Orchard.Blogs.ViewModels {
public class BlogViewModel : BaseViewModel {
public ItemDisplayViewModel<Blog> Blog { get; set; }
public ItemDisplayModel<Blog> Blog { get; set; }
}
}

2
src/Orchard.Web/Packages/Orchard.Blogs/ViewModels/BlogsForAdminViewModel.cs
View File

@@ -5,6 +5,6 @@ using Orchard.Mvc.ViewModels;
namespace Orchard.Blogs.ViewModels {
public class BlogsForAdminViewModel : AdminViewModel {
public IEnumerable<ItemDisplayViewModel<Blog>> Blogs { get; set; }
public IEnumerable<ItemDisplayModel<Blog>> Blogs { get; set; }
}
}

2
src/Orchard.Web/Packages/Orchard.Blogs/ViewModels/BlogsViewModel.cs
View File

@@ -5,6 +5,6 @@ using Orchard.Mvc.ViewModels;
namespace Orchard.Blogs.ViewModels {
public class BlogsViewModel : BaseViewModel {
public IEnumerable<ItemDisplayViewModel<Blog>> Blogs { get; set; }
public IEnumerable<ItemDisplayModel<Blog>> Blogs { get; set; }
}
}

2
src/Orchard.Web/Packages/Orchard.Blogs/ViewModels/CreateBlogPostViewModel.cs
View File

@@ -4,6 +4,6 @@ using Orchard.Mvc.ViewModels;
namespace Orchard.Blogs.ViewModels {
public class CreateBlogPostViewModel : AdminViewModel {
public ItemEditorViewModel<BlogPost> BlogPost { get; set; }
public ItemEditorModel<BlogPost> BlogPost { get; set; }
}
}

2
src/Orchard.Web/Packages/Orchard.Blogs/ViewModels/CreateBlogViewModel.cs
View File

@@ -4,6 +4,6 @@ using Orchard.Mvc.ViewModels;
namespace Orchard.Blogs.ViewModels {
public class CreateBlogViewModel : AdminViewModel {
public ItemEditorViewModel<Blog> Blog { get; set; }
public ItemEditorModel<Blog> Blog { get; set; }
}
}

2
src/Orchard.Web/Packages/Orchard.Blogs/Views/Models/DisplayTemplates/BlogDetail.ascx
View File

@@ -1,4 +1,4 @@
<%@ Control Language="C#" Inherits="System.Web.Mvc.ViewUserControl<ItemDisplayViewModel<Blog>>" %>
<%@ Control Language="C#" Inherits="System.Web.Mvc.ViewUserControl<ItemDisplayModel<Blog>>" %>
<%@ Import Namespace="Orchard.Mvc.Html"%>
<%@ Import Namespace="Orchard.Blogs.Extensions"%>
<%@ Import Namespace="Orchard.Blogs.Models"%>

2
src/Orchard.Web/Packages/Orchard.Blogs/Views/Models/DisplayTemplates/BlogDetailAdmin.ascx
View File

@@ -1,4 +1,4 @@
<%@ Control Language="C#" Inherits="System.Web.Mvc.ViewUserControl<ItemDisplayViewModel<Blog>>" %>
<%@ Control Language="C#" Inherits="System.Web.Mvc.ViewUserControl<ItemDisplayModel<Blog>>" %>
<%@ Import Namespace="Orchard.Mvc.Html"%>
<%@ Import Namespace="Orchard.Models.ViewModels"%>
<%@ Import Namespace="Orchard.Blogs.Extensions"%>

2
src/Orchard.Web/Packages/Orchard.Blogs/Views/Models/DisplayTemplates/BlogPostDetail.ascx
View File

@@ -1,4 +1,4 @@
<%@ Control Language="C#" Inherits="System.Web.Mvc.ViewUserControl<ItemDisplayViewModel<BlogPost>>" %>
<%@ Control Language="C#" Inherits="System.Web.Mvc.ViewUserControl<ItemDisplayModel<BlogPost>>" %>
<%@ Import Namespace="Orchard.Mvc.Html"%>
<%@ Import Namespace="Orchard.Models.ViewModels"%>
<%@ Import Namespace="Orchard.Blogs.Extensions"%>

2
src/Orchard.Web/Packages/Orchard.Blogs/Views/Models/DisplayTemplates/BlogPostList.ascx
View File

@@ -1,4 +1,4 @@
<%@ Control Language="C#" Inherits="System.Web.Mvc.ViewUserControl<IEnumerable<ItemDisplayViewModel<BlogPost>>>" %>
<%@ Control Language="C#" Inherits="System.Web.Mvc.ViewUserControl<IEnumerable<ItemDisplayModel<BlogPost>>>" %>
<%@ Import Namespace="Orchard.Mvc.Html"%>
<%@ Import Namespace="Orchard.Models.ViewModels"%>
<%@ Import Namespace="Orchard.Blogs.Models"%>

2
src/Orchard.Web/Packages/Orchard.Blogs/Views/Models/DisplayTemplates/BlogPostListAdmin.ascx
View File

@@ -1,4 +1,4 @@
<%@ Control Language="C#" Inherits="System.Web.Mvc.ViewUserControl<IEnumerable<ItemDisplayViewModel<BlogPost>>>" %>
<%@ Control Language="C#" Inherits="System.Web.Mvc.ViewUserControl<IEnumerable<ItemDisplayModel<BlogPost>>>" %>
<%@ Import Namespace="Orchard.Mvc.Html"%>
<%@ Import Namespace="Orchard.Models.ViewModels"%>
<%@ Import Namespace="Orchard.Blogs.Models"%>

2
src/Orchard.Web/Packages/Orchard.Blogs/Views/Models/DisplayTemplates/BlogPostSummary.ascx
View File

@@ -1,4 +1,4 @@
<%@ Control Language="C#" Inherits="System.Web.Mvc.ViewUserControl<ItemDisplayViewModel<BlogPost>>" %>
<%@ Control Language="C#" Inherits="System.Web.Mvc.ViewUserControl<ItemDisplayModel<BlogPost>>" %>
<%@ Import Namespace="Orchard.Models"%>
<%@ Import Namespace="Orchard.Core.Common.Models"%>
<%@ Import Namespace="Orchard.Models.ViewModels"%>

2
src/Orchard.Web/Packages/Orchard.Blogs/Views/Models/DisplayTemplates/BlogPostSummaryAdmin.ascx
View File

@@ -1,4 +1,4 @@
<%@ Control Language="C#" Inherits="System.Web.Mvc.ViewUserControl<ItemDisplayViewModel<BlogPost>>" %>
<%@ Control Language="C#" Inherits="System.Web.Mvc.ViewUserControl<ItemDisplayModel<BlogPost>>" %>
<%@ Import Namespace="Orchard.Models"%>
<%@ Import Namespace="Orchard.Core.Common.Models"%>
<%@ Import Namespace="Orchard.Models.ViewModels"%>

2
src/Orchard.Web/Packages/Orchard.Blogs/Views/Models/DisplayTemplates/BlogSummary.ascx
View File

@@ -1,4 +1,4 @@
<%@ Control Language="C#" Inherits="System.Web.Mvc.ViewUserControl<ItemDisplayViewModel<Blog>>" %>
<%@ Control Language="C#" Inherits="System.Web.Mvc.ViewUserControl<ItemDisplayModel<Blog>>" %>
<%@ Import Namespace="Orchard.Mvc.Html"%>
<%@ Import Namespace="Orchard.Models.ViewModels"%>
<%@ Import Namespace="Orchard.Blogs.Extensions"%>

2
src/Orchard.Web/Packages/Orchard.Blogs/Views/Models/DisplayTemplates/BlogSummaryAdmin.ascx
View File

@@ -1,4 +1,4 @@
<%@ Control Language="C#" Inherits="System.Web.Mvc.ViewUserControl<ItemDisplayViewModel<Blog>>" %>
<%@ Control Language="C#" Inherits="System.Web.Mvc.ViewUserControl<ItemDisplayModel<Blog>>" %>
<%@ Import Namespace="Orchard.Models.ViewModels"%>
<%@ Import Namespace="Orchard.Blogs.Extensions"%>
<%@ Import Namespace="Orchard.Blogs.Models"%>

2
src/Orchard.Web/Packages/Orchard.Blogs/Views/Models/EditorTemplates/Blog.ascx
View File

@@ -1,4 +1,4 @@
<%@ Control Language="C#" Inherits="System.Web.Mvc.ViewUserControl<ItemEditorViewModel<Blog>>" %>
<%@ Control Language="C#" Inherits="System.Web.Mvc.ViewUserControl<ItemEditorModel<Blog>>" %>
<%@ Import Namespace="Orchard.Models.ViewModels"%>
<%@ Import Namespace="Orchard.Mvc.Html"%>
<%@ Import Namespace="Orchard.Blogs.Models"%>

2
src/Orchard.Web/Packages/Orchard.Blogs/Views/Models/EditorTemplates/BlogPost.ascx
View File

@@ -1,4 +1,4 @@
<%@ Control Language="C#" Inherits="System.Web.Mvc.ViewUserControl<ItemEditorViewModel<BlogPost>>" %>
<%@ Control Language="C#" Inherits="System.Web.Mvc.ViewUserControl<ItemEditorModel<BlogPost>>" %>
<%@ Import Namespace="Orchard.Models.ViewModels"%>
<%@ Import Namespace="Orchard.Mvc.Html"%>
<%@ Import Namespace="Orchard.Blogs.Models"%>

6
src/Orchard.Web/Packages/Orchard.Comments/Models/CommentsHandler.cs
View File

@@ -19,21 +19,21 @@ namespace Orchard.Comments.Models {
Filters.Add(new ActivatingFilter<HasComments>("blogpost"));
}
protected override void GetDisplayViewModel(GetDisplayViewModelContext context) {
protected override void BuildDisplayModel(BuildDisplayModelContext context) {
if (context.ContentItem.Has<HasComments>() == false) {
return;
}
context.AddDisplay(new TemplateViewModel(context.ContentItem.Get<HasComments>()) { Position = "999" });
}
protected override void GetEditorViewModel(GetEditorViewModelContext context) {
protected override void BuildEditorModel(BuildEditorModelContext context) {
if (context.ContentItem.Has<HasComments>() == false) {
return;
}
context.AddEditor(new TemplateViewModel(context.ContentItem.Get<HasComments>()));
}
protected override void UpdateEditorViewModel(UpdateEditorViewModelContext context) {
protected override void UpdateEditorModel(UpdateEditorModelContext context) {
if (context.ContentItem.Has<HasComments>() == false) {
return;
}

4
src/Orchard.Web/Packages/Orchard.DevTools/Controllers/ContentController.cs
View File

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

4
src/Orchard.Web/Packages/Orchard.DevTools/Models/DebugLinkHandler.cs
View File

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

8
src/Orchard.Web/Packages/Orchard.DevTools/ViewModels/ContentDetailsViewModel.cs
View File

@@ -13,13 +13,13 @@ namespace Orchard.DevTools.ViewModels {
public IEnumerable<Type> 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<TemplateViewModel> Displays { get { return DisplayView.Displays; } }
public IEnumerable<TemplateViewModel> Displays { get { return DisplayModel.Displays; } }
public IEnumerable<TemplateViewModel> Editors { get { return EditorView.Editors; } }
public IEnumerable<TemplateViewModel> Editors { get { return EditorModel.Editors; } }
public object Locate(Type type) {
return Item.ContentItem.Get(type);

4
src/Orchard.Web/Packages/Orchard.Media/Models/MediaSettings.cs
View File

@@ -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<MediaSettings>();
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<MediaSettings>();
if (model == null)
return;

4
src/Orchard.Web/Packages/Orchard.Roles/Models/UserRolesHandler.cs
View File

@@ -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<UserRoles>();
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<UserRoles>();
if (userRoles != null) {
var viewModel = new UserRolesViewModel();

8
src/Orchard.Web/Packages/Orchard.Sandbox/Controllers/PageController.cs
View File

@@ -32,7 +32,7 @@ namespace Orchard.Sandbox.Controllers {
Pages = _contentManager.Query<SandboxPage, SandboxPageRecord>()
.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<SandboxPage>(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<SandboxPage>(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<SandboxPage>(id);
var model = new PageEditViewModel {
Page = _contentManager.UpdateEditorViewModel(page, null, this)
Page = _contentManager.UpdateEditorModel(page, null, this)
};
if (!ModelState.IsValid)
return View(model);

2
src/Orchard.Web/Packages/Orchard.Sandbox/ViewModels/PageEditViewModel.cs
View File

@@ -6,6 +6,6 @@ using Orchard.Sandbox.Models;
namespace Orchard.Sandbox.ViewModels {
public class PageEditViewModel : BaseViewModel {
public ItemEditorViewModel<SandboxPage> Page { get; set; }
public ItemEditorModel<SandboxPage> Page { get; set; }
}
}

2
src/Orchard.Web/Packages/Orchard.Sandbox/ViewModels/PageIndexViewModel.cs
View File

@@ -5,6 +5,6 @@ using Orchard.Sandbox.Models;
namespace Orchard.Sandbox.ViewModels {
public class PageIndexViewModel : BaseViewModel {
public IEnumerable<ItemDisplayViewModel<SandboxPage>> Pages { get; set; }
public IEnumerable<ItemDisplayModel<SandboxPage>> Pages { get; set; }
}
}

2
src/Orchard.Web/Packages/Orchard.Sandbox/ViewModels/PageShowViewModel.cs
View File

@@ -4,6 +4,6 @@ using Orchard.Sandbox.Models;
namespace Orchard.Sandbox.ViewModels {
public class PageShowViewModel : BaseViewModel {
public ItemDisplayViewModel<SandboxPage> Page { get; set; }
public ItemDisplayModel<SandboxPage> Page { get; set; }
}
}

2
src/Orchard.Web/Packages/Orchard.Sandbox/Views/Models/DisplayTemplates/SandboxPage.ascx
View File

@@ -1,4 +1,4 @@
<%@ Control Language="C#" Inherits="System.Web.Mvc.ViewUserControl<ItemDisplayViewModel<SandboxPage>>" %>
<%@ Control Language="C#" Inherits="System.Web.Mvc.ViewUserControl<ItemDisplayModel<SandboxPage>>" %>
<%@ Import Namespace="Orchard.Mvc.Html" %>
<%@ Import Namespace="Orchard.Sandbox.Models" %>
<%@ Import Namespace="Orchard.Models.ViewModels" %>

2
src/Orchard.Web/Packages/Orchard.Sandbox/Views/Models/DisplayTemplates/SandboxPageSummary.ascx
View File

@@ -1,4 +1,4 @@
<%@ Control Language="C#" Inherits="System.Web.Mvc.ViewUserControl<ItemDisplayViewModel<SandboxPage>>" %>
<%@ Control Language="C#" Inherits="System.Web.Mvc.ViewUserControl<ItemDisplayModel<SandboxPage>>" %>
<%@ Import Namespace="Orchard.Mvc.Html"%>
<%@ Import Namespace="Orchard.Sandbox.Models" %>
<%@ Import Namespace="Orchard.Models.ViewModels" %>

2
src/Orchard.Web/Packages/Orchard.Sandbox/Views/Models/EditorTemplates/SandboxPage.ascx
View File

@@ -1,4 +1,4 @@
<%@ Control Language="C#" Inherits="System.Web.Mvc.ViewUserControl<ItemEditorViewModel<SandboxPage>>" %>
<%@ Control Language="C#" Inherits="System.Web.Mvc.ViewUserControl<ItemEditorModel<SandboxPage>>" %>
<%@ Import Namespace="Orchard.Mvc.Html" %>
<%@ Import Namespace="Orchard.Sandbox.Models" %>
<%@ Import Namespace="Orchard.Models.ViewModels" %>

2
src/Orchard.Web/Packages/Orchard.Tags/Controllers/HomeController.cs
View File

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

4
src/Orchard.Web/Packages/Orchard.Tags/Models/TagsHandler.cs
View File

@@ -37,14 +37,14 @@ namespace Orchard.Tags.Models {
});
}
protected override void GetEditorViewModel(GetEditorViewModelContext context) {
protected override void BuildEditorModel(BuildEditorModelContext context) {
if (context.ContentItem.Has<HasTags>() == false) {
return;
}
context.AddEditor(new TemplateViewModel(context.ContentItem.Get<HasTags>()) { Position = "0" });
}
protected override void UpdateEditorViewModel(UpdateEditorViewModelContext context) {
protected override void UpdateEditorModel(UpdateEditorModelContext context) {
if (context.ContentItem.Has<HasTags>() == false) {
return;
}

2
src/Orchard.Web/Packages/Orchard.Tags/ViewModels/TagsSearchViewModel.cs
View File

@@ -6,6 +6,6 @@ using Orchard.Mvc.ViewModels;
namespace Orchard.Tags.ViewModels {
public class TagsSearchViewModel : BaseViewModel {
public string TagName { get; set; }
public IEnumerable<ItemDisplayViewModel<IContent>> Items { get; set; }
public IEnumerable<ItemDisplayModel<IContent>> Items { get; set; }
}
}

10
src/Orchard.Web/Packages/Orchard.Users/Controllers/AdminController.cs
View File

@@ -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<User>(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<User>(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);

2
src/Orchard.Web/Packages/Orchard.Users/ViewModels/UserCreateViewModel.cs
View File

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

4
src/Orchard.Web/Packages/Orchard.Users/ViewModels/UserEditViewModel.cs
View File

@@ -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)]

2
src/Orchard.Web/Packages/Orchard.Users/Views/Admin/EditorTemplates/UserCreateViewModel.ascx
View File

@@ -6,7 +6,7 @@
<%=Html.EditorFor(m=>m.Password, "inputPasswordLarge") %>
<%=Html.EditorFor(m=>m.ConfirmPassword, "inputPasswordLarge") %>
</fieldset><%
foreach(var e in Model.ItemView.Editors) {
foreach(var e in Model.EditorModel.Editors) {
var editor = e;%>
<fieldset>
<%=Html.EditorFor(m => editor.Model, editor.TemplateName, editor.Prefix)%>

2
src/Orchard.Web/Packages/Orchard.Users/Views/Admin/EditorTemplates/UserEditViewModel.ascx
View File

@@ -7,6 +7,6 @@
<%=Html.EditorFor(m=>m.Email, "inputTextLarge") %>
</ol>
<% foreach(var e in Model.ItemView.Editors) {%>
<% foreach(var e in Model.EditorModel.Editors) {%>
<%=Html.EditorFor(m => e.Model, e.TemplateName, e.Prefix)%>
<%} %>