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

Make page manager not use the page view model (separation of concerns)

Browse Source 
--HG--
extra : convert_revision : svn%3A5ff7c347-ad56-4c35-b696-ccb81de16e03/trunk%4041950
This commit is contained in:
loudej
2009-11-23 21:19:23 +00:00
parent 4b9d0b6c57
commit b12767c8ce
7 changed files with 52 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Orchard.Web/Packages/Orchard.CmsPages/Controllers/AdminController.cs
View File

@@ -204,7 +204,7 @@ namespace Orchard.CmsPages.Controllers {
Logger.Information("Creating CmsPage slug:{0} title{1}: template{2}",
viewModel.Slug, viewModel.Title, viewModel.TemplateName);
var revision = _pageManager.CreatePage(viewModel);
var revision = _pageManager.CreatePage(new CreatePageParams(viewModel.Title, viewModel.Slug, viewModel.TemplateName));
return RedirectToAction("Edit", new { revision.Page.Id });
}
catch (Exception ex) {

25
src/Orchard.Web/Packages/Orchard.CmsPages/Services/PageManager.cs
View File

@@ -22,13 +22,26 @@ namespace Orchard.CmsPages.Services {
public PublishHistory History { get; set; }
}
public class CreatePageParams {
public CreatePageParams(){}
public CreatePageParams(string title, string slug, string templateName) {
Title = title;
Slug = slug;
TemplateName = templateName;
}
public string Title { get; set; }
public string Slug { get; set; }
public string TemplateName { get; set; }
}
public interface IPageManager : IDependency {
IEnumerable<string> GetCurrentlyPublishedSlugs();
PageRevision GetPublishedBySlug(string slug);
PageRevision GetLastRevision(int pageId);
PageRevision CreatePage(PageCreateViewModel pageCreate);
PageRevision CreatePage(CreatePageParams createPageParams);
PageRevision AcquireDraft(int pageId);
void ApplyTemplateName(PageRevision revision, string templateName);
void Publish(PageRevision revision, [NotNull] PublishOptions options);
@@ -60,7 +73,8 @@ namespace Orchard.CmsPages.Services {
public ILogger Logger { get; set; }
public PageRevision CreatePage(PageCreateViewModel pageCreate) {
public PageRevision CreatePage(CreatePageParams createPageParams) {
Logger.Information("CreatePage");
//var templateDescriptor = _templateProvider.Get(pageCreate.TemplateName);
@@ -68,9 +82,8 @@ namespace Orchard.CmsPages.Services {
var page = new Page();
var revision = new PageRevision {
Page = page,
Title = pageCreate.Title,
Slug = pageCreate.Slug,
TemplateName = pageCreate.TemplateName,
Title = createPageParams.Title,
Slug = createPageParams.Slug,
ModifiedDate = _clock.UtcNow,
Number = 1
};
@@ -81,7 +94,7 @@ namespace Orchard.CmsPages.Services {
// revision.Contents.Add(new ContentItem { PageRevision = revision, ZoneName = zone });
// }
//}
ApplyTemplateName(revision, pageCreate.TemplateName);
ApplyTemplateName(revision, createPageParams.TemplateName);
_pageRepository.Create(page);

5
src/Orchard.Web/Packages/Orchard.CmsPages/Services/XmlRpcHandler.cs
View File

@@ -75,10 +75,7 @@ namespace Orchard.CmsPages.Services {
var title = content.Optional<string>("title");
var description = content.Optional<string>("description");
var pageRevision = _pageManager.CreatePage(new PageCreateViewModel {
Title = title,
TemplateName = "TwoColumns"
});
var pageRevision = _pageManager.CreatePage(new CreatePageParams(title, null, "TwoColumns"));
pageRevision.Contents.First().Content = description;
if (publish) {