#17236 Changing recent blog post widget to handle homepage blogs like in the Archives widget

Work Item: 17236

--HG--
branch : dev
extra : transplant_source : r%A8%1C%E2D%BF%8Fz%E4%9F%83%07%F5o%C5%8DR%21%96s

src/Orchard.Web/Modules/Orchard.Blogs/Drivers/RecentBlogPostsPartDriver.cs

@@ -1,7 +1,8 @@
-using System.Collections.Generic;
+using System.Linq;
-using System.Linq;
 using Orchard.Blogs.Models;
+using Orchard.Blogs.Routing;
 using Orchard.Blogs.Services;
+using Orchard.Blogs.ViewModels;
 using Orchard.ContentManagement;
 using Orchard.ContentManagement.Drivers;
 using Orchard.Core.Common.Models;
@@ -10,33 +11,30 @@ namespace Orchard.Blogs.Drivers {
     public class RecentBlogPostsPartDriver : ContentPartDriver<RecentBlogPostsPart> {
         private readonly IBlogService _blogService;
         private readonly IContentManager _contentManager;
+        private readonly IBlogPathConstraint _blogPathConstraint;
 
-        public RecentBlogPostsPartDriver(IBlogService blogService, IContentManager contentManager) {
+        public RecentBlogPostsPartDriver(
+            IBlogService blogService, 
+            IContentManager contentManager,
+            IBlogPathConstraint blogPathConstraint) {
             _blogService = blogService;
             _contentManager = contentManager;
+            _blogPathConstraint = blogPathConstraint;
         }
 
         protected override DriverResult Display(RecentBlogPostsPart part, string displayType, dynamic shapeHelper) {
-            IEnumerable<BlogPostPart> blogPosts;
+            var path = _blogPathConstraint.FindPath(part.ForBlog);
+            BlogPart blog = _blogService.Get(path);
 
-            BlogPart blog = null;
+            if (blog == null) {
-            if (!string.IsNullOrWhiteSpace(part.ForBlog))
+                return null;
-                blog = _blogService.Get(part.ForBlog);
+            }
 
-            if (blog != null) {
+            var blogPosts =_contentManager.Query(VersionOptions.Published, "BlogPost")
-                blogPosts = _contentManager.Query(VersionOptions.Published, "BlogPost")
+                .Join<CommonPartRecord>().Where(cr => cr.Container == blog.Record.ContentItemRecord)
-                    .Join<CommonPartRecord>().Where(cr => cr.Container == blog.Record.ContentItemRecord)
+                .OrderByDescending(cr => cr.CreatedUtc)
-                    .OrderByDescending(cr => cr.CreatedUtc)
+                .Slice(0, part.Count)
-                    .Slice(0, part.Count)
+                .Select(ci => ci.As<BlogPostPart>());
-                    .Select(ci => ci.As<BlogPostPart>());
-            }
-            else {
-                blogPosts = _contentManager.Query(VersionOptions.Published, "BlogPost")
-                    .Join<CommonPartRecord>()
-                    .OrderByDescending(cr => cr.CreatedUtc)
-                    .Slice(0, part.Count)
-                    .Select(ci => ci.As<BlogPostPart>());
-            }
 
             var list = shapeHelper.List();
             list.AddRange(blogPosts.Select(bp => _contentManager.BuildDisplay(bp, "Summary")));
@@ -47,12 +45,23 @@ namespace Orchard.Blogs.Drivers {
         }
 
         protected override DriverResult Editor(RecentBlogPostsPart part, dynamic shapeHelper) {
+            var viewModel = new RecentBlogPostsViewModel {
+                Count = part.Count,
+                Path = part.ForBlog,
+                Blogs = _blogService.Get().ToList().OrderBy(b => b.Name)
+            };
+
             return ContentShape("Parts_Blogs_RecentBlogPosts_Edit",
-                                () => shapeHelper.EditorTemplate(TemplateName: "Parts.Blogs.RecentBlogPosts", Model: part, Prefix: Prefix));
+                                () => shapeHelper.EditorTemplate(TemplateName: "Parts.Blogs.RecentBlogPosts", Model: viewModel, Prefix: Prefix));
         }
 
         protected override DriverResult Editor(RecentBlogPostsPart part, IUpdateModel updater, dynamic shapeHelper) {
-            updater.TryUpdateModel(part, Prefix, null, null);
+            var viewModel = new RecentBlogPostsViewModel();
+            if (updater.TryUpdateModel(viewModel, Prefix, null, null)) {
+                part.ForBlog = viewModel.Path;
+                part.Count = viewModel.Count;
+            } 
+            
             return Editor(part, shapeHelper);
         }
     }

src/Orchard.Web/Modules/Orchard.Blogs/Orchard.Blogs.csproj

@@ -78,10 +78,10 @@
     <Compile Include="Handlers\BlogPartArchiveHandler.cs" />
     <Compile Include="Models\BlogPartArchiveRecord.cs" />
     <Compile Include="Permissions.cs" />
-    <Compile Include="Routing\IBlogSlugConstraint.cs" />
+    <Compile Include="Routing\IBlogPathConstraint.cs" />
     <Compile Include="Routing\IsArchiveConstraint.cs" />
-    <Compile Include="Routing\BlogSlugConstraint.cs" />
+    <Compile Include="Routing\BlogPathConstraint.cs" />
-    <Compile Include="Routing\BlogSlugConstraintUpdator.cs" />
+    <Compile Include="Routing\BlogPathConstraintUpdator.cs" />
     <Compile Include="Security\BlogAuthorizationEventHandler.cs" />
     <Compile Include="Services\BlogService.cs" />
     <Compile Include="Controllers\BlogController.cs" />
@@ -97,6 +97,7 @@
     <Compile Include="Services\IBlogService.cs" />
     <Compile Include="Services\XmlRpcHandler.cs" />
     <Compile Include="ViewModels\BlogArchivesViewModel.cs" />
+    <Compile Include="ViewModels\RecentBlogPostsViewModel.cs" />
   </ItemGroup>
   <ItemGroup>
     <Content Include="Content\Admin\images\draft.gif" />

src/Orchard.Web/Modules/Orchard.Blogs/ViewModels/RecentBlogPostsViewModel.cs

@@ -0,0 +1,10 @@
+using System.Collections.Generic;
+using Orchard.Blogs.Models;
+
+namespace Orchard.Blogs.ViewModels {
+    public class RecentBlogPostsViewModel {
+        public int Count { get; set; }
+        public string Path { get; set; }
+        public IEnumerable<BlogPart> Blogs { get; set; }
+    }
+}

src/Orchard.Web/Modules/Orchard.Blogs/Views/EditorTemplates/Parts.Blogs.RecentBlogPosts.cshtml

@@ -1,8 +1,18 @@
-@model Orchard.Blogs.Models.RecentBlogPostsPart
+@model Orchard.Blogs.ViewModels.RecentBlogPostsViewModel
+
+@using Orchard.Blogs.Models;
+@using Orchard.Core.Routable.Models;
+@using Orchard.ContentManagement;
+
 <fieldset>
     <div>
-        @Html.LabelFor(m => m.ForBlog, T("For Blog"))
+        @Html.LabelFor(m => m.Path, T("For Blog"))
-        @Html.TextBoxFor(m => m.ForBlog)
+        <select id="@Html.FieldIdFor(m => m.Path)" name="@Html.FieldNameFor(m => m.Path)">
+		@foreach(BlogPart blog in Model.Blogs) {
+            @Html.SelectOption(Model.Path, blog.As<RoutePart>().Path, blog.Name)
+		}
+		</select>
+        <span class="hint">@T("Select which blog you want to display the recent posts for")</span>
     </div>
     <div>
         @Html.LabelFor(m => m.Count, T("Count"))