Merge branch 'release/v8.0.13'

AaronSadlerUK · Jun 26, 2020 · 62f0984 · 62f0984
2 parents f040913 + e18bb81
commit 62f0984
Show file tree

Hide file tree

Showing 8 changed files with 22 additions and 17 deletions.
diff --git a/Builds/NuGet/Umbraco.MegaNavV8.Core.nuspec b/Builds/NuGet/Umbraco.MegaNavV8.Core.nuspec
@@ -2,7 +2,7 @@
 <package >
   <metadata>
     <id>AaronSadler.MegaNavV8.Core</id>
-    <version>8.0.9</version>
+    <version>8.0.10</version>
     <title>Umbraco.MegaNavV8.Core</title>
     <authors>Aaron Sadler, Callum Whyte</authors>
     <owners>Aaron Sadler, Callum Whyte</owners>
@@ -12,7 +12,7 @@
     <icon>MegaNavV8-Logo.png</icon>
     <summary>A flexible, draggable link picker for constructing site navigation menus, big or small, in Umbraco</summary>
     <description>A flexible, draggable link picker for constructing site navigation menus, big or small, in Umbraco</description>
-    <releaseNotes><![CDATA[Added support for Umbraco Deploy to transfer dependent nodes between environments]]></releaseNotes>
+    <releaseNotes><![CDATA[Fixed exception caused by incorrect type in value converter]]></releaseNotes>
     <copyright>Copyright 2020</copyright>
     <tags>umbraco, umbraco-cms, MegaNav, MegaNav-V8</tags>
 	<dependencies>

diff --git a/Builds/NuGet/Umbraco.MegaNavV8.Web.nuspec b/Builds/NuGet/Umbraco.MegaNavV8.Web.nuspec
@@ -12,11 +12,11 @@
     <icon>MegaNavV8-Logo.png</icon>
     <summary>A flexible, draggable link picker for constructing site navigation menus, big or small, in Umbraco</summary>
     <description>A flexible, draggable link picker for constructing site navigation menus, big or small, in Umbraco</description>
-    <releaseNotes><![CDATA[Added support for Umbraco Deploy to transfer dependent nodes between environments, added the ability to collapse / expand tree items]]></releaseNotes>
+    <releaseNotes><![CDATA[Fixed exception caused by incorrect type in value converter]]></releaseNotes>
     <copyright>Copyright 2020</copyright>
     <tags>umbraco, umbraco-cms, MegaNav, MegaNav-V8</tags>
 	<dependencies>
-	  <dependency id="AaronSadler.MegaNavV8.Core" version="8.0.9" />
+	  <dependency id="AaronSadler.MegaNavV8.Core" version="8.0.10" />
 	  <dependency id="AaronSadler.MegaNavV8.Api" version="8.0.10" />
     </dependencies>
   </metadata>

diff --git a/Builds/Umbraco.MegaNavV8_8.0.13.zip b/Builds/Umbraco.MegaNavV8_8.0.13.zip
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,6 +3,10 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](http://keepachangelog.com/) and this project adheres to [Semantic Versioning](http://semver.org/).
 
+## [8.0.13] - 2020-06-26
+### Fixed
+* Fixed exception caused by incorrect type in value converter
+
 ## [8.0.12] - 2020-06-22
 ### Added
 * Ability to collapse / expand tree children, the is stored and it will remember on page refresh / reload

diff --git a/TestSite/App_Data/packages/createdPackages.config b/TestSite/App_Data/packages/createdPackages.config
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="1" version="8.0.12" url="https://github.com/AaronSadlerUK/Umbraco.MegaNavV8" name="Umbraco.MegaNavV8" packagePath="~/media/created-packages/Umbraco.MegaNavV8_8.0.12.zip" iconUrl="https://raw.githubusercontent.com/AaronSadlerUK/Umbraco.MegaNavV8/master/Builds/MegaNavV8-Logo.png" umbVersion="8.4.0" packageGuid="ab215413-3dee-4475-93f3-fe4736de6533" view="">
+  <package id="1" version="8.0.13" url="https://github.com/AaronSadlerUK/Umbraco.MegaNavV8" name="Umbraco.MegaNavV8" packagePath="~/media/created-packages/Umbraco.MegaNavV8_8.0.13.zip" iconUrl="https://raw.githubusercontent.com/AaronSadlerUK/Umbraco.MegaNavV8/master/Builds/MegaNavV8-Logo.png" umbVersion="8.4.0" packageGuid="ab215413-3dee-4475-93f3-fe4736de6533" view="">
     <license url="http://opensource.org/licenses/MIT"><![CDATA[MIT License]]></license>
     <author url="https://aaronsadler.uk"><![CDATA[Aaron Sadler]]></author>
     <contributors>

diff --git a/TestSite/Web.config b/TestSite/Web.config
@@ -83,7 +83,7 @@
       <add verb="GET,HEAD" path="ScriptResource.axd" type="System.Web.Handlers.ScriptResourceHandler, System.Web.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31BF3856AD364E35" validate="false" />
       <add verb="*" path="DependencyHandler.axd" type="ClientDependency.Core.CompositeFiles.CompositeDependencyHandler, ClientDependency.Core " />
     </httpHandlers>
-    <compilation defaultLanguage="c#" debug="true" batch="true" targetFramework="4.7.2" numRecompilesBeforeAppRestart="50" />
+    <compilation defaultLanguage="c#" debug="false" batch="true" targetFramework="4.7.2" numRecompilesBeforeAppRestart="50" />
     <authentication mode="Forms">
       <forms name="yourAuthCookie" loginUrl="login.aspx" protection="All" path="/" />
     </authentication>

diff --git a/TestSite/uSync/v8/Content/main-navigation.config b/TestSite/uSync/v8/Content/main-navigation.config
@@ -16,7 +16,7 @@
     <megaNavV8>
       <Value><![CDATA[[
   {
-    "id": 1104,
+    "id": 1123,
     "udi": "umb://document/ca4249ed2b234337b52263cabe5587d1",
     "name": "Home",
     "url": "/",
@@ -26,17 +26,17 @@
     "naviHide": false
   },
   {
-    "id": 1105,
+    "id": 1129,
     "udi": "umb://document/ec4aafcc0c254f25a8fe705bfae1d324",
-    "name": "Products",
-    "url": "/products/",
+    "name": "Products2",
+    "url": "/products2/",
     "children": [],
     "icon": "icon-shopping-basket color-black",
     "published": true,
     "naviHide": false
   },
   {
-    "id": 1114,
+    "id": 1128,
     "udi": "umb://document/e8ad9b65cff64952ac5befe56a60db62",
     "name": "People",
     "url": "/people/",
@@ -46,13 +46,13 @@
     "naviHide": false
   },
   {
-    "id": 1120,
+    "id": 1124,
     "udi": "umb://document/3cce2545e3ac44ecbf55a52cc5965db3",
     "name": "About Us",
     "url": "/about-us/",
     "children": [
       {
-        "id": 1121,
+        "id": 1130,
         "udi": "umb://document/ee82cba3a0e740639ae13026a4f72a3d",
         "name": "About this Starter Kit",
         "url": "/about-us/about-this-starter-kit/",
@@ -64,10 +64,11 @@
     ],
     "icon": "icon-document",
     "published": true,
-    "naviHide": false
+    "naviHide": false,
+    "collapsed": false
   },
   {
-    "id": 1123,
+    "id": 1125,
     "udi": "umb://document/1d770f10d1ca4a269d68071e2c9f7ac1",
     "name": "Blog",
     "url": "/blog/",
@@ -77,7 +78,7 @@
     "naviHide": false
   },
   {
-    "id": 1127,
+    "id": 1126,
     "udi": "umb://document/4a1f4198e14348baa0f51a7ef2df23aa",
     "name": "Contact",
     "url": "/contact/",

diff --git a/src/Our.Umbraco.MeganavV8.Core/Models/MeganavV8Item.cs b/src/Our.Umbraco.MeganavV8.Core/Models/MeganavV8Item.cs
@@ -29,7 +29,7 @@ public class MeganavV8Item
 
         [JsonIgnore]
         public int Level { get; set; }
-        public int Collapsed { get; set; }
+        public bool Collapsed { get; set; }
 
         public GuidUdi Udi { get; set; }