Merge pull request #65 from umco/develop

Preparing v2.0.3 release

Author: leekelleher

appveyor.yml

@@ -1,7 +1,7 @@
 image: Visual Studio 2017
 
 # version format
-version: 2.0.2.{build}
+version: 2.0.3.{build}
 
 # UMBRACO_PACKAGE_PRERELEASE_SUFFIX if a rtm release build this should be blank, otherwise if empty will default to alpha
 # example UMBRACO_PACKAGE_PRERELEASE_SUFFIX=beta

build/package.nuspec

@@ -16,7 +16,7 @@
 		<language></language>
 		<tags></tags>
 		<dependencies>
-			<dependency id="Our.Umbraco.InnerContent" version="[2,3)" />
+			<dependency id="Our.Umbraco.InnerContent" version="[2.0.3,3)" />
 		</dependencies>
 	</metadata>
 	<files />

src/Our.Umbraco.StackedContent/Web/Controllers/StackedContentApiController.cs

@@ -46,7 +46,7 @@ public HttpResponseMessage GetPreviewMarkup([FromBody] JObject item, int pageId)
             // TODO: Review. The values in `item` are the "editor values", whereas for prevalue-based editors, the converter is expecting the "database value". [LK:2018-12-12]
 
             // Convert item
-            var content = InnerContentHelper.ConvertInnerContentToPublishedContent(item, page, preview: true);
+            var content = InnerContentHelper.ConvertInnerContentToPublishedContent(item, page);
 
             // Construct preview model
             var model = new PreviewModel { Page = page, Item = content };

src/Our.Umbraco.StackedContent/Web/Helpers/ViewHelper.cs

@@ -1,4 +1,5 @@
-using System.IO;
+using System.Collections.Generic;
+using System.IO;
 using System.Linq;
 using System.Web;
 using System.Web.Mvc;
@@ -20,6 +21,9 @@ private class DummyController : Controller { }
             }
         };
 
+        // NOTE: So not to flood the logs with repeat warnings, the missing partial-views are kept track of.
+        private static readonly HashSet<string> MissingPartialViews = new HashSet<string>();
+
         public static void AddViewLocationFormats(params string[] viewLocationFormats)
         {
             var newFormats = ViewEngine
@@ -42,9 +46,10 @@ internal static string RenderPartial(string partialName, object model)
                 var controllerContext = new ControllerContext(new RequestContext(httpContext, routeData), new DummyController());
 
                 var viewResult = ViewEngine.FindPartialView(controllerContext, partialName, false);
-                if (viewResult.View == null)
+                if (viewResult.View == null && MissingPartialViews.Contains(partialName) == false)
                 {
                     LogHelper.Warn(typeof(ViewHelper), $"No view found for partial '{partialName}'");
+                    MissingPartialViews.Add(partialName);
                     return null;
                 }
 

src/Our.Umbraco.StackedContent/Web/UI/App_Plugins/StackedContent/js/stackedcontent.js

@@ -130,6 +130,7 @@ angular.module("umbraco").controller("Our.Umbraco.StackedContent.Controllers.Sta
         $scope.overlayConfig = {
             propertyAlias: $scope.model.alias,
             contentTypes: $scope.model.config.contentTypes,
+            enableFilter: $scope.model.config.enableFilter,
             show: false,
             data: {
                 idx: 0,