diff --git a/CHANGELOG.md b/CHANGELOG.md index b72258a..19eceea 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,7 +5,11 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). -## [Unreleased] +## 1.2.6 - 2020-12-07 +- Fix: Error saving temp blueprint +- Fix: issue when previewing linked content items + +## [1.2.5] - 2020-11-01 - Resetting saveButtonState when validation contains errors #221 - Handle null value when deserializing grid value in DataValueReference 50ba85aaeeb66ed305248d303d568e4698943094 @@ -49,7 +53,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 - Developers Guide updated - New minimum Umbraco version requirement: 8.1.0 - Doc Type Grid Editor will not work in lower versions! -[unreleased]: https://github.com/skttl/umbraco-doc-type-grid-editor/compare/1.2.4...HEAD +[unreleased]: https://github.com/skttl/umbraco-doc-type-grid-editor/compare/1.2.5...HEAD +[1.2.5]: https://github.com/skttl/umbraco-doc-type-grid-editor/compare/1.2.4...1.2.5 [1.2.4]: https://github.com/skttl/umbraco-doc-type-grid-editor/compare/1.2.3...1.2.4 [1.2.3]: https://github.com/skttl/umbraco-doc-type-grid-editor/compare/1.2.2...1.2.3 [1.2.2]: https://github.com/skttl/umbraco-doc-type-grid-editor/compare/1.2.1...1.2.2 diff --git a/appveyor.yml b/appveyor.yml index f891a56..7ef8bf3 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,7 +1,7 @@ image: Visual Studio 2017 # version format -version: 1.2.5.{build} +version: 1.2.6.{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 diff --git a/src/Our.Umbraco.DocTypeGridEditor/Web/Controllers/DocTypeGridEditorApiController.cs b/src/Our.Umbraco.DocTypeGridEditor/Web/Controllers/DocTypeGridEditorApiController.cs index bfa1dc1..0fbda1e 100644 --- a/src/Our.Umbraco.DocTypeGridEditor/Web/Controllers/DocTypeGridEditorApiController.cs +++ b/src/Our.Umbraco.DocTypeGridEditor/Web/Controllers/DocTypeGridEditorApiController.cs @@ -31,7 +31,7 @@ public class DocTypeGridEditorApiController : UmbracoAuthorizedJsonController private readonly IContentTypeService _contentTypeService; private readonly IDataTypeService _dataTypeService; private readonly IPublishedContentCache _contentCache; - + public DocTypeGridEditorApiController() { } @@ -157,7 +157,7 @@ public HttpResponseMessage GetPreviewMarkup([FromBody] PreviewData data, [FromUr UmbracoContext.PublishedRequest = router.CreateRequest(UmbracoContext, Request.RequestUri); UmbracoContext.PublishedRequest.PublishedContent = page; } - + // Set the culture for the preview if (page != null && page.Cultures != null) { @@ -168,6 +168,7 @@ public HttpResponseMessage GetPreviewMarkup([FromBody] PreviewData data, [FromUr UmbracoContext.PublishedRequest.Culture = culture; System.Threading.Thread.CurrentThread.CurrentCulture = culture; System.Threading.Thread.CurrentThread.CurrentUICulture = culture; + UmbracoContext.VariationContextAccessor.VariationContext = new VariationContext(culture.Name); } } diff --git a/src/Our.Umbraco.DocTypeGridEditor/Web/UI/App_Plugins/DocTypeGridEditor/Js/doctypegrideditor.controllers.js b/src/Our.Umbraco.DocTypeGridEditor/Web/UI/App_Plugins/DocTypeGridEditor/Js/doctypegrideditor.controllers.js index 731d5dd..d709429 100644 --- a/src/Our.Umbraco.DocTypeGridEditor/Web/UI/App_Plugins/DocTypeGridEditor/Js/doctypegrideditor.controllers.js +++ b/src/Our.Umbraco.DocTypeGridEditor/Web/UI/App_Plugins/DocTypeGridEditor/Js/doctypegrideditor.controllers.js @@ -288,6 +288,7 @@ angular.module("umbraco").controller("Our.Umbraco.DocTypeGridEditor.Dialogs.DocT } contentEditingHelper.contentEditorPerformSave(args).then(function (data) { + $scope.model.node.id = data.id; $scope.model.submit($scope.model); // Reset original value of $routeParams.create $routeParams.create = routeParamsCreate; @@ -296,6 +297,7 @@ angular.module("umbraco").controller("Our.Umbraco.DocTypeGridEditor.Dialogs.DocT // Set original value of $routeParams.create $routeParams.create = routeParamsCreate; // cleanup the blueprint immediately + $scope.model.node.id = err.data.id; cleanup(); vm.saveButtonState = "error"; });