Roughing out early support for common contents controller

Listing and creating any defined content type
Early stages - many features to be added - expect poor compatability with existing types and parts

--HG--
branch : dev

src/Orchard.Web/Core/Common/Views/EditorTemplates/Parts/Common.Routable.ascx

@@ -24,7 +24,8 @@
                 url:"<%=Url.Slugify() %>",
                 contentType:"<%=Model.RoutableAspect.ContentItem.ContentType %>",
                 id:"<%=Model.RoutableAspect.ContentItem.Id %>"<%
-                var container = Model.RoutableAspect.ContentItem.As<ICommonAspect>().Container;
+                var commonAspect = Model.RoutableAspect.ContentItem.As<ICommonAspect>();
+                var container = commonAspect != null ? commonAspect.Container : null;
                 if (container != null) { %>,
                 containerId:<%=container.ContentItem.Id %><%
                 } %>

src/Orchard.Web/Core/Contents/AdminMenu.cs

@@ -0,0 +1,19 @@
+using Orchard.Localization;
+using Orchard.Security;
+using Orchard.UI.Navigation;
+
+namespace Orchard.Core.Contents {
+    public class AdminMenu : INavigationProvider {
+        public Localizer T { get; set; }
+        public string MenuName { get { return "admin"; } }
+
+        public void GetNavigation(NavigationBuilder builder) {
+            builder.Add(T("Content"), "1",
+                        menu => {
+                            menu.Add(T("Create"), "1.1", item => item.Action("Create", "Admin", new { area = "Contents" }));
+                            menu.Add(T("List"), "1.2", item => item.Action("List", "Admin", new { area = "Contents" }));
+                            menu.Add(T("Types"), "1.3", item => item.Action("Types", "Admin", new { area = "Contents" }));
+                        });
+        }
+    }
+}

src/Orchard.Web/Core/Contents/Controllers/AdminController.cs

@@ -0,0 +1,166 @@
+using System;
+using System.Linq;
+using System.Web.Mvc;
+using System.Web.Routing;
+using Orchard.ContentManagement;
+using Orchard.ContentManagement.MetaData;
+using Orchard.ContentManagement.Records;
+using Orchard.Core.Contents.ViewModels;
+using Orchard.Data;
+using Orchard.Localization;
+using Orchard.Logging;
+using Orchard.Mvc.ViewModels;
+using Orchard.UI.Notify;
+
+namespace Orchard.Core.Contents.Controllers {
+    [ValidateInput(false)]
+    public class AdminController : Controller, IUpdateModel {
+        private readonly INotifier _notifier;
+        private readonly IContentDefinitionManager _contentDefinitionManager;
+        private readonly IContentManager _contentManager;
+        private readonly ITransactionManager _transactionManager;
+
+        public AdminController(
+            INotifier notifier,
+            IContentDefinitionManager contentDefinitionManager,
+            IContentManager contentManager,
+            ITransactionManager transactionManager) {
+            _notifier = notifier;
+            _contentDefinitionManager = contentDefinitionManager;
+            _contentManager = contentManager;
+            _transactionManager = transactionManager;
+            T = NullLocalizer.Instance;
+            Logger = NullLogger.Instance;
+        }
+
+        public Localizer T { get; set; }
+        public ILogger Logger { get; set; }
+
+        public ActionResult Index() {
+            return Types();
+        }
+
+        public ActionResult Types() {
+            return View("Types", new ContentTypeListViewModel {
+                Types = _contentDefinitionManager.ListTypeDefinitions()
+            });
+        }
+
+        public ActionResult List(ListContentViewModel model) {
+            const int pageSize = 20;
+            var skip = (Math.Max(model.Page ?? 0, 1) - 1) * pageSize;
+
+            var query = _contentManager.Query(VersionOptions.Latest);
+
+            if (!string.IsNullOrEmpty(model.Id)) {
+                query = query.ForType(model.Id);
+            }
+
+            var contentItems = query.Slice(skip, pageSize);
+
+            model.Entries = contentItems.Select(BuildEntry).ToList();
+
+            return View("List", model);
+        }
+
+        private ListContentViewModel.Entry BuildEntry(ContentItem contentItem) {
+            var entry = new ListContentViewModel.Entry {
+                ContentItem = contentItem,
+                ContentItemMetadata = _contentManager.GetItemMetadata(contentItem),
+                ViewModel = _contentManager.BuildDisplayModel(contentItem, "List"),
+            };
+            if (string.IsNullOrEmpty(entry.ContentItemMetadata.DisplayText)) {
+                entry.ContentItemMetadata.DisplayText = string.Format("[{0}#{1}]", contentItem.ContentType, contentItem.Id);
+            }
+            if (entry.ContentItemMetadata.EditorRouteValues == null) {
+                entry.ContentItemMetadata.EditorRouteValues = new RouteValueDictionary {
+                    {"Area", "Contents"},
+                    {"Controller", "Admin"},
+                    {"Action", "Edit"},
+                    {"Id", contentItem.Id}
+                };
+            }
+            return entry;
+        }
+
+        ActionResult CreatableTypeList() {
+            var model = new ContentTypeListViewModel {
+                Types = _contentDefinitionManager.ListTypeDefinitions()
+            };
+
+            return View("CreatableTypeList", model);
+        }
+
+        public ActionResult Create(string id) {
+            if (string.IsNullOrEmpty(id))
+                return CreatableTypeList();
+
+            var contentItem = _contentManager.New(id);
+            var model = new CreateItemViewModel {
+                Id = id,
+                Content = _contentManager.BuildEditorModel(contentItem)
+            };
+            PrepareEditorViewModel(model.Content);
+            return View("Create", model);
+        }
+
+
+        [HttpPost]
+        public ActionResult Create(CreateItemViewModel model) {
+            var contentItem = _contentManager.New(model.Id);
+            model.Content = _contentManager.UpdateEditorModel(contentItem, this);
+            if (ModelState.IsValid) {
+                _contentManager.Create(contentItem, VersionOptions.Draft);
+                model.Content = _contentManager.UpdateEditorModel(contentItem, this);
+            }
+            if (ModelState.IsValid) {
+                _contentManager.Publish(contentItem);
+            }
+            if (!ModelState.IsValid) {
+                _transactionManager.Cancel();
+                PrepareEditorViewModel(model.Content);
+                return View("Create", model);
+            }
+
+            _notifier.Information(T("Created content item"));
+            return RedirectToAction("Edit", new RouteValueDictionary { { "Id", contentItem.Id } });
+        }
+
+        public ActionResult Edit(int id) {
+            var contentItem = _contentManager.Get(id, VersionOptions.Latest);
+            var model = new EditItemViewModel {
+                Id = id,
+                Content = _contentManager.BuildEditorModel(contentItem)
+            };
+            PrepareEditorViewModel(model.Content);
+            return View("Edit", model);
+        }
+
+        [HttpPost]
+        public ActionResult Edit(EditItemViewModel model) {
+            var contentItem = _contentManager.Get(model.Id, VersionOptions.DraftRequired);
+            model.Content = _contentManager.UpdateEditorModel(contentItem, this);
+            if (!ModelState.IsValid) {
+                _transactionManager.Cancel();
+                PrepareEditorViewModel(model.Content);
+                return View("Edit", model);
+            }
+            _contentManager.Publish(contentItem);
+            return RedirectToAction("Edit", new RouteValueDictionary { { "Id", contentItem.Id } });
+        }
+
+        private void PrepareEditorViewModel(ContentItemViewModel itemViewModel) {
+            if (string.IsNullOrEmpty(itemViewModel.TemplateName)) {
+                itemViewModel.TemplateName = "Items/Contents.Item";
+            }
+        }
+
+        bool IUpdateModel.TryUpdateModel<TModel>(TModel model, string prefix, string[] includeProperties, string[] excludeProperties) {
+            return TryUpdateModel(model, prefix, includeProperties, excludeProperties);
+        }
+
+        void IUpdateModel.AddModelError(string key, LocalizedString errorMessage) {
+            ModelState.AddModelError(key, errorMessage);
+        }
+    }
+}

src/Orchard.Web/Core/Contents/Module.txt

@@ -0,0 +1,11 @@
+Name: Contents
+antiforgery: enabled
+author: The Orchard Team
+website: http://orchardproject.net
+version: 0.1
+orchardversion: 0.1.2010.0312
+description: Lorem ipsum dolor sit amet, consectetur adipiscing elit. Maecenas consectetur consequat risus, vel blandit arcu tincidunt eget. Nam rutrum nulla vestibulum dolor dapibus sagittis. Vivamus convallis faucibus accumsan. Suspendisse sapien enim, cursus at dignissim a, sollicitudin sit amet est. Class aptent taciti sociosqu ad litora torquent per conubia nostra, per inceptos himenaeos. Donec sed urna magna, in luctus nulla. Pellentesque erat ipsum, convallis sed molestie tempus, mattis vel leo metus. 
+features:
+    Contents:
+        Description: Default controllers for some content types.
+        Category: Core

src/Orchard.Web/Core/Contents/ViewModels/ContentTypeListViewModel.cs

@@ -0,0 +1,10 @@
+using System;
+using System.Collections.Generic;
+using Orchard.ContentManagement.MetaData.Models;
+using Orchard.Mvc.ViewModels;
+
+namespace Orchard.Core.Contents.ViewModels {
+    public class ContentTypeListViewModel : BaseViewModel {
+        public IEnumerable<ContentTypeDefinition> Types { get; set; }
+    }
+}

src/Orchard.Web/Core/Contents/ViewModels/CreateItemViewModel.cs

@@ -0,0 +1,8 @@
+using Orchard.Mvc.ViewModels;
+
+namespace Orchard.Core.Contents.ViewModels {
+    public class CreateItemViewModel : BaseViewModel {
+        public string Id { get; set; }
+        public ContentItemViewModel Content { get; set; }
+    }
+}

src/Orchard.Web/Core/Contents/ViewModels/EditItemViewModel.cs

@@ -0,0 +1,8 @@
+using Orchard.Mvc.ViewModels;
+
+namespace Orchard.Core.Contents.ViewModels {
+    public class EditItemViewModel : BaseViewModel {
+        public int Id { get; set; }
+        public ContentItemViewModel Content { get; set; }
+    }
+}

src/Orchard.Web/Core/Contents/ViewModels/ListContentViewModel.cs

@@ -0,0 +1,18 @@
+using System;
+using System.Collections.Generic;
+using Orchard.ContentManagement;
+using Orchard.Mvc.ViewModels;
+
+namespace Orchard.Core.Contents.ViewModels {
+    public class ListContentViewModel : BaseViewModel {
+        public string Id { get; set; }
+        public int? Page { get; set; }
+        public IList<Entry> Entries { get; set; }
+
+        public class Entry {
+            public ContentItem ContentItem { get; set; }
+            public ContentItemMetadata ContentItemMetadata { get; set; }
+            public ContentItemViewModel ViewModel { get; set; }
+        }
+    }
+}

src/Orchard.Web/Core/Contents/Views/Admin/CreatableTypeList.aspx

@@ -0,0 +1,12 @@
+<%@ Page Language="C#" Inherits="Orchard.Mvc.ViewPage<ContentTypeListViewModel>" %>
+
+<%@ Import Namespace="Orchard.Core.Contents.ViewModels" %>
+<% Html.AddTitleParts(T("Create Content").ToString()); %>
+<p>
+    Create content</p>
+<ul>
+    <% foreach (var t in Model.Types) {%>
+    <li>
+        <%:Html.ActionLink(t.Name, "Create", new RouteValueDictionary{{"Area","Contents"},{"Id",t.Name}}) %></li>
+    <%} %>
+</ul>

src/Orchard.Web/Core/Contents/Views/Admin/Create.aspx

@@ -0,0 +1,8 @@
+<%@ Page Language="C#" Inherits="Orchard.Mvc.ViewPage<CreateItemViewModel>" %>
+
+<%@ Import Namespace="Orchard.Core.Contents.ViewModels" %>
+<% Html.AddTitleParts(T("Create Content").ToString()); %>
+<% using (Html.BeginFormAntiForgeryPost()) { %>
+<%:Html.ValidationSummary() %>
+<%:Html.EditorForItem(m=>m.Content) %>
+<%} %>

src/Orchard.Web/Core/Contents/Views/Admin/Edit.aspx

@@ -0,0 +1,8 @@
+<%@ Page Language="C#" Inherits="Orchard.Mvc.ViewPage<EditItemViewModel>" %>
+
+<%@ Import Namespace="Orchard.Core.Contents.ViewModels" %>
+<% Html.AddTitleParts(T("Edit Content").ToString()); %>
+<% using (Html.BeginFormAntiForgeryPost()) { %>
+<%:Html.ValidationSummary() %>
+<%:Html.EditorForItem(m=>m.Content) %>
+<%} %>

src/Orchard.Web/Core/Contents/Views/Admin/List.aspx

@@ -0,0 +1,33 @@
+<%@ Page Language="C#" Inherits="Orchard.Mvc.ViewPage<ListContentViewModel>" %>
+
+<%@ Import Namespace="Orchard.Core.Contents.ViewModels" %>
+<% Html.AddTitleParts(T("Browse Contents").ToString()); %>
+<p>
+    Browse Contents</p>
+<table>
+    <% foreach (var t in Model.Entries) {%>
+    <tr>
+        <td>
+            <%:t.ContentItem.Id %>.
+        </td>
+        <td>
+            <%:t.ContentItem.ContentType %>
+        </td>
+        <td>
+            ver #<%:t.ContentItem.Version %>
+        </td>
+        <td>
+            <%if (t.ContentItemMetadata.DisplayRouteValues != null) {%>
+            <%:Html.ActionLink(t.ContentItemMetadata.DisplayText, t.ContentItemMetadata.DisplayRouteValues["Action"].ToString(), t.ContentItemMetadata.DisplayRouteValues)%>
+            <%}%>
+        </td>
+        <td>
+            <%if (t.ContentItemMetadata.EditorRouteValues != null) {%>
+            <%:Html.ActionLink("edit", t.ContentItemMetadata.EditorRouteValues["Action"].ToString(), t.ContentItemMetadata.EditorRouteValues)%>
+            <%}%>
+        </td>
+    </tr>
+    <%} %>
+</table>
+<p>
+    <%:Html.ActionLink("Create new item", "Create", "Admin", new RouteValueDictionary{{"Area","Contents"},{"Id",Model.Id}}, new Dictionary<string, object>()) %></p>

src/Orchard.Web/Core/Contents/Views/Admin/Types.aspx

@@ -0,0 +1,24 @@
+<%@ Page Language="C#" Inherits="Orchard.Mvc.ViewPage<ContentTypeListViewModel>" %>
+
+<%@ Import Namespace="Orchard.Core.Contents.ViewModels" %>
+<% Html.AddTitleParts(T("Create Content").ToString()); %>
+<p>
+    Create content</p>
+<table>
+    <% foreach (var t in Model.Types) {%>
+    <tr>
+        <td>
+            <%:t.Name %>
+        </td>
+        <td>
+            <%:Html.ActionLink(T("List Items"), "List", "Admin", new RouteValueDictionary{{"Area","Contents"},{"Id",t.Name}}, new Dictionary<string, object>()) %>
+        </td>
+        <td>
+            <%:Html.ActionLink(T("Create Item"), "Create", "Admin", new RouteValueDictionary{{"Area","Contents"},{"Id",t.Name}}, new Dictionary<string, object>()) %>
+        </td>
+        <td>
+            <%:Html.ActionLink(T("Edit Type"), "ContentTypeList", "Admin", new RouteValueDictionary{{"Area","Orchard.MetaData"},{"Id",t.Name}}, new Dictionary<string, object>()) %>
+        </td>
+    </tr>
+    <%} %>
+</table>

src/Orchard.Web/Core/Contents/Views/EditorTemplates/Items/Contents.Item.ascx

@@ -0,0 +1,14 @@
+<%@ Control Language="C#" Inherits="Orchard.Mvc.ViewUserControl<ContentItemViewModel>" %>
+<%@ Import Namespace="Orchard.Mvc.ViewModels"%>
+<div class="sections">
+    <div class="primary"><%
+        Html.Zone("primary");
+        Html.ZonesExcept("secondary"); %>
+    </div>
+    <div class="secondary">
+        <% Html.Zone("secondary");%>
+        <fieldset>
+            <input class="button primaryAction" type="submit" name="submit.Save" value="<%=_Encoded("Save") %>"/>
+        </fieldset>
+    </div>
+</div>

src/Orchard.Web/Core/Contents/Views/Web.config

@@ -0,0 +1,34 @@
+<?xml version="1.0"?>
+<configuration>
+  <system.web>
+    <httpHandlers>
+      <add path="*" verb="*"
+          type="System.Web.HttpNotFoundHandler"/>
+    </httpHandlers>
+
+    <!--
+        Enabling request validation in view pages would cause validation to occur
+        after the input has already been processed by the controller. By default
+        MVC performs request validation before a controller processes the input.
+        To change this behavior apply the ValidateInputAttribute to a
+        controller or action.
+    -->
+    <pages
+        validateRequest="false"
+        pageParserFilterType="System.Web.Mvc.ViewTypeParserFilter, System.Web.Mvc, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"
+        pageBaseType="System.Web.Mvc.ViewPage, System.Web.Mvc, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35"
+        userControlBaseType="System.Web.Mvc.ViewUserControl, System.Web.Mvc, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35">
+      <controls>
+        <add assembly="System.Web.Mvc, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" namespace="System.Web.Mvc" tagPrefix="mvc" />
+      </controls>
+    </pages>
+  </system.web>
+
+  <system.webServer>
+    <validation validateIntegratedModeConfiguration="false"/>
+    <handlers>
+      <remove name="BlockViewHandler"/>
+      <add name="BlockViewHandler" path="*" verb="*" preCondition="integratedMode" type="System.Web.HttpNotFoundHandler"/>
+    </handlers>
+  </system.webServer>
+</configuration>

src/Orchard.Web/Core/Orchard.Core.csproj

@@ -86,6 +86,12 @@
     <Compile Include="Common\ViewModels\BodyEditorViewModel.cs" />
     <Compile Include="Common\ViewModels\RoutableEditorViewModel.cs" />
     <Compile Include="Common\ViewModels\OwnerEditorViewModel.cs" />
+    <Compile Include="Contents\AdminMenu.cs" />
+    <Compile Include="Contents\Controllers\AdminController.cs" />
+    <Compile Include="Contents\ViewModels\CreateItemViewModel.cs" />
+    <Compile Include="Contents\ViewModels\ContentTypeListViewModel.cs" />
+    <Compile Include="Contents\ViewModels\EditItemViewModel.cs" />
+    <Compile Include="Contents\ViewModels\ListContentViewModel.cs" />
     <Compile Include="Dashboard\AdminMenu.cs" />
     <Compile Include="Dashboard\Controllers\AdminController.cs" />
     <Compile Include="Dashboard\Routes.cs" />
@@ -179,6 +185,13 @@
   </ItemGroup>
   <ItemGroup>
     <Content Include="Common\Module.txt" />
+    <Content Include="Contents\Module.txt" />
+    <Content Include="Contents\Views\Admin\Types.aspx" />
+    <Content Include="Contents\Views\Admin\List.aspx" />
+    <Content Include="Contents\Views\Admin\Edit.aspx" />
+    <Content Include="Contents\Views\Admin\CreatableTypeList.aspx" />
+    <Content Include="Contents\Views\Admin\Create.aspx" />
+    <Content Include="Contents\Views\EditorTemplates\Items\Contents.Item.ascx" />
     <Content Include="Indexing\Module.txt" />
     <Content Include="Settings\Module.txt" />
     <Content Include="Settings\Views\Admin\Index.ascx" />
@@ -231,6 +244,7 @@
   <ItemGroup>
     <None Include="App_Data\Localization\en-US\orchard.core.po" />
     <None Include="App_Data\Localization\fr-FR\orchard.core.po" />
+    <Content Include="Contents\Views\Web.config" />
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v10.0\WebApplications\Microsoft.WebApplication.targets" />

src/Orchard.Web/Modules/Orchard.Setup/Services/SetupService.cs

@@ -57,6 +57,7 @@ namespace Orchard.Setup.Services {
                 string[] hardcoded = {
                     "Orchard.Framework",
                     "Common",
+                    "Contents",
                     "Dashboard",
                     "Feeds",
                     "HomePage",