From 944898d6e5fe9c736aec65ae334b5a1f54159648 Mon Sep 17 00:00:00 2001
From: Wincent <david.wincent@gmail.com>
Date: Tue, 21 Jun 2016 14:18:55 +0200
Subject: [PATCH 1/3] http://issues.umbraco.org/issue/U4-8530 Adds Preview
 property to ContentItemDisplay

---
 src/Umbraco.Web.UI.Client/src/views/content/edit.html  |  2 +-
 .../Models/ContentEditing/ContentItemDisplay.cs        | 10 +++++++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/content/edit.html b/src/Umbraco.Web.UI.Client/src/views/content/edit.html
index be79f797a0..c07dad7555 100644
--- a/src/Umbraco.Web.UI.Client/src/views/content/edit.html
+++ b/src/Umbraco.Web.UI.Client/src/views/content/edit.html
@@ -58,7 +58,7 @@
                </umb-button>
 
                <umb-button
-                  ng-if="!page.isNew"
+                  ng-if="!page.isNew && content.preview"
                   type="button"
                   action="preview(content)"
                   label="Preview page"
diff --git a/src/Umbraco.Web/Models/ContentEditing/ContentItemDisplay.cs b/src/Umbraco.Web/Models/ContentEditing/ContentItemDisplay.cs
index c595831b3b..17ec927371 100644
--- a/src/Umbraco.Web/Models/ContentEditing/ContentItemDisplay.cs
+++ b/src/Umbraco.Web/Models/ContentEditing/ContentItemDisplay.cs
@@ -20,6 +20,11 @@ namespace Umbraco.Web.Models.ContentEditing
     [DataContract(Name = "content", Namespace = "")]
     public class ContentItemDisplay : ListViewAwareContentItemDisplayBase<ContentPropertyDisplay, IContent>
     {
+        public ContentItemDisplay()
+        {
+            Preview = true;
+        }
+
         [DataMember(Name = "publishDate")]
         public DateTime? PublishDate { get; set; }
 
@@ -34,7 +39,10 @@ namespace Umbraco.Web.Models.ContentEditing
 
         [DataMember(Name = "urls")]
         public string[] Urls { get; set; }
-        
+
+        [DataMember( Name = "preview" )]
+        public bool Preview { get; set; }
+
         /// <summary>
         /// The allowed 'actions' based on the user's permissions - Create, Update, Publish, Send to publish
         /// </summary>

From 2c15db595085f36229c0bbe2de49232a88109706 Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Thu, 4 Aug 2016 18:34:20 +0200
Subject: [PATCH 2/3] U4-8530 Make it possbile to hide preview button by
 DocumentType or ContentItem

---
 .../src/views/content/edit.html                      |  2 +-
 .../Models/ContentEditing/ContentItemDisplay.cs      | 12 +++++++++---
 src/Umbraco.Web/Models/Mapping/ContentModelMapper.cs |  1 +
 3 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/src/Umbraco.Web.UI.Client/src/views/content/edit.html b/src/Umbraco.Web.UI.Client/src/views/content/edit.html
index c07dad7555..baf1cd7b3d 100644
--- a/src/Umbraco.Web.UI.Client/src/views/content/edit.html
+++ b/src/Umbraco.Web.UI.Client/src/views/content/edit.html
@@ -58,7 +58,7 @@
                </umb-button>
 
                <umb-button
-                  ng-if="!page.isNew && content.preview"
+                  ng-if="!page.isNew && content.allowPreview"
                   type="button"
                   action="preview(content)"
                   label="Preview page"
diff --git a/src/Umbraco.Web/Models/ContentEditing/ContentItemDisplay.cs b/src/Umbraco.Web/Models/ContentEditing/ContentItemDisplay.cs
index 17ec927371..2615c8774d 100644
--- a/src/Umbraco.Web/Models/ContentEditing/ContentItemDisplay.cs
+++ b/src/Umbraco.Web/Models/ContentEditing/ContentItemDisplay.cs
@@ -22,7 +22,7 @@ namespace Umbraco.Web.Models.ContentEditing
     {
         public ContentItemDisplay()
         {
-            Preview = true;
+            AllowPreview = true;
         }
 
         [DataMember(Name = "publishDate")]
@@ -40,8 +40,14 @@ namespace Umbraco.Web.Models.ContentEditing
         [DataMember(Name = "urls")]
         public string[] Urls { get; set; }
 
-        [DataMember( Name = "preview" )]
-        public bool Preview { get; set; }
+        /// <summary>
+        /// Determines whether previewing is allowed for this node
+        /// </summary>
+        /// <remarks>
+        /// By default this is true but by using events developers can toggle this off for certain documents if there is nothing to preview
+        /// </remarks>
+        [DataMember( Name = "allowPreview" )]
+        public bool AllowPreview { get; set; }
 
         /// <summary>
         /// The allowed 'actions' based on the user's permissions - Create, Update, Publish, Send to publish
diff --git a/src/Umbraco.Web/Models/Mapping/ContentModelMapper.cs b/src/Umbraco.Web/Models/Mapping/ContentModelMapper.cs
index 7f50b618d4..e2cdd1f7e4 100644
--- a/src/Umbraco.Web/Models/Mapping/ContentModelMapper.cs
+++ b/src/Umbraco.Web/Models/Mapping/ContentModelMapper.cs
@@ -66,6 +66,7 @@ namespace Umbraco.Web.Models.Mapping
                             ? new[] {"Cannot generate urls without a current Umbraco Context"}
                             : content.GetContentUrls(UmbracoContext.Current)))
                 .ForMember(display => display.Properties, expression => expression.Ignore())
+                .ForMember(display => display.AllowPreview, expression => expression.Ignore())
                 .ForMember(display => display.TreeNodeUrl, expression => expression.Ignore())
                 .ForMember(display => display.Notifications, expression => expression.Ignore())
                 .ForMember(display => display.Errors, expression => expression.Ignore())

From 69b6044bc640ad27a65c9412eaf32f4800b40db5 Mon Sep 17 00:00:00 2001
From: Claus <claus@claus.nu>
Date: Fri, 5 Aug 2016 14:01:25 +0200
Subject: [PATCH 3/3] fixing null check on UmbracoContext.Current in
 RedirectTrackingEventHandler's PageCacheRefresher_CacheUpdated.

---
 src/Umbraco.Web/Redirects/RedirectTrackingEventHandler.cs | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/Umbraco.Web/Redirects/RedirectTrackingEventHandler.cs b/src/Umbraco.Web/Redirects/RedirectTrackingEventHandler.cs
index 39b3351aac..417238bdbe 100644
--- a/src/Umbraco.Web/Redirects/RedirectTrackingEventHandler.cs
+++ b/src/Umbraco.Web/Redirects/RedirectTrackingEventHandler.cs
@@ -93,6 +93,8 @@ namespace Umbraco.Web.Redirects
         {
             get
             {
+                if (UmbracoContext.Current == null)
+                    return null;
                 var oldRoutes = (Dictionary<int, Tuple<Guid, string>>) UmbracoContext.Current.HttpContext.Items[ContextKey3];
                 if (oldRoutes == null)
                     UmbracoContext.Current.HttpContext.Items[ContextKey3] = oldRoutes = new Dictionary<int, Tuple<Guid, string>>();
@@ -165,8 +167,11 @@ namespace Umbraco.Web.Redirects
 
         private void PageCacheRefresher_CacheUpdated(PageCacheRefresher sender, CacheRefresherEventArgs cacheRefresherEventArgs)
         {
-            var removeKeys = new List<int>();
+            if (OldRoutes == null)
+                return;
 
+            var removeKeys = new List<int>();
+            
             foreach (var oldRoute in OldRoutes)
             {
                 // assuming we cannot have 'CacheUpdated' for only part of the infos else we'd need