From f0efbeb4065bb7d34a79717a379e7dbb27546c70 Mon Sep 17 00:00:00 2001 From: Nicholas Mayne Date: Thu, 25 Sep 2014 20:21:56 +0100 Subject: [PATCH] #18210: Changing preview to pass a version through, this was layers are kicked in. Work Item: 18210 --- src/Orchard.Web/Core/Contents/Controllers/ItemController.cs | 5 ++++- .../Views/Parts.Contents.Publish.SummaryAdmin.cshtml | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/Orchard.Web/Core/Contents/Controllers/ItemController.cs b/src/Orchard.Web/Core/Contents/Controllers/ItemController.cs index 1e6ed8c35..68dc0e186 100644 --- a/src/Orchard.Web/Core/Contents/Controllers/ItemController.cs +++ b/src/Orchard.Web/Core/Contents/Controllers/ItemController.cs @@ -22,10 +22,13 @@ namespace Orchard.Core.Contents.Controllers { public Localizer T { get; set; } // /Contents/Item/Display/72 - public ActionResult Display(int? id) { + public ActionResult Display(int? id, int? version) { if (id == null) return HttpNotFound(); + if (version.HasValue) + return Preview(id, version); + var contentItem = _contentManager.Get(id.Value, VersionOptions.Published); if (contentItem == null) diff --git a/src/Orchard.Web/Core/Contents/Views/Parts.Contents.Publish.SummaryAdmin.cshtml b/src/Orchard.Web/Core/Contents/Views/Parts.Contents.Publish.SummaryAdmin.cshtml index 838856d8d..6e0a21285 100644 --- a/src/Orchard.Web/Core/Contents/Views/Parts.Contents.Publish.SummaryAdmin.cshtml +++ b/src/Orchard.Web/Core/Contents/Views/Parts.Contents.Publish.SummaryAdmin.cshtml @@ -15,7 +15,7 @@ @Html.Link(T("Publish Draft").Text, Url.Action("Publish", "Admin", new { area = "Contents", id = contentPart.ContentItem.Id, returnUrl = Request.ToUrlString() }), new { itemprop = "UnsafeUrl" }) @T(" | ") - @Html.ActionLink(T("Preview").Text, "Preview", "Item", new {area = "Contents", id = ((ContentItem) Model.ContentPart.ContentItem).Id}, new {}) + @Html.ActionLink(T("Preview").Text, "Display", "Item", new {area = "Contents", id = ((ContentItem) Model.ContentPart.ContentItem, version = ((ContentItem)Model.ContentPart.ContentItem).Version).Id}, new {}) @T(" | ") } } @@ -26,7 +26,7 @@ } } else { if ( contentPart.HasDraft() ) { - @Html.ActionLink(T("Preview").Text, "Preview", "Item", new { area = "Contents", id = ((ContentItem)Model.ContentPart.ContentItem).Id }, new { }) + @Html.ActionLink(T("Preview").Text, "Display", "Item", new { area = "Contents", id = ((ContentItem)Model.ContentPart.ContentItem).Id, version = ((ContentItem)Model.ContentPart.ContentItem).Version }, new { }) @T(" | ") }