merge release/v8.0.14 into master

AaronSadlerUK · Aug 7, 2020 · 28a2f3e · 28a2f3e
2 parents 1089ab8 + 854c118
commit 28a2f3e
Show file tree

Hide file tree

Showing 7 changed files with 18 additions and 11 deletions.
diff --git a/Builds/NuGet/Umbraco.MegaNavV8.Api.nuspec b/Builds/NuGet/Umbraco.MegaNavV8.Api.nuspec
@@ -2,7 +2,7 @@
 <package >
   <metadata>
     <id>AaronSadler.MegaNavV8.Api</id>
-    <version>8.0.10</version>
+    <version>8.0.11</version>
     <title>Umbraco.MegaNavV8.Api</title>
     <authors>Aaron Sadler, Callum Whyte</authors>
     <owners>Aaron Sadler, Callum Whyte</owners>
@@ -12,14 +12,14 @@
     <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[Refactored slightly]]></releaseNotes>
+    <releaseNotes><![CDATA[Changed converter to retrieve most recent url from cache]]></releaseNotes>
     <copyright>Copyright 2020</copyright>
     <tags>umbraco, umbraco-cms, MegaNav, MegaNav-V8</tags>
 	<dependencies>
 	  <group targetFramework=".NETFramework4.7.2">
 		  <dependency id="UmbracoCms.Web" version="8.4.0" />
 		  <dependency id="UmbracoCms.Core" version="8.4.0" />
-		  <dependency id="AaronSadler.MegaNavV8.Core" version="8.0.9" />
+		  <dependency id="AaronSadler.MegaNavV8.Core" version="8.0.11" />
 	  </group>
     </dependencies>
   </metadata>

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.10</version>
+    <version>8.0.11</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[Fixed exception caused by incorrect type in value converter]]></releaseNotes>
+    <releaseNotes><![CDATA[Changed converter to retrieve most recent url from cache]]></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
@@ -2,7 +2,7 @@
 <package >
   <metadata>
     <id>AaronSadler.MegaNavV8.Web</id>
-    <version>8.0.13</version>
+    <version>8.0.14</version>
     <title>Umbraco.MegaNavV8.Web</title>
     <authors>Aaron Sadler, Callum Whyte</authors>
     <owners>Aaron Sadler, Callum Whyte</owners>
@@ -12,12 +12,12 @@
     <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[Fixed exception caused by incorrect type in value converter]]></releaseNotes>
+    <releaseNotes><![CDATA[Changed converter to retrieve most recent url from cache]]></releaseNotes>
     <copyright>Copyright 2020</copyright>
     <tags>umbraco, umbraco-cms, MegaNav, MegaNav-V8</tags>
 	<dependencies>
-	  <dependency id="AaronSadler.MegaNavV8.Core" version="8.0.10" />
-	  <dependency id="AaronSadler.MegaNavV8.Api" version="8.0.10" />
+	  <dependency id="AaronSadler.MegaNavV8.Core" version="8.0.11" />
+	  <dependency id="AaronSadler.MegaNavV8.Api" version="8.0.11" />
     </dependencies>
   </metadata>
       <files>

diff --git a/Builds/Umbraco.MegaNavV8_8.0.14.zip b/Builds/Umbraco.MegaNavV8_8.0.14.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.14] - 2020-06-26
+### Changed
+* Changed converter to retrieve most recent url from cache
+
 ## [8.0.13] - 2020-06-26
 ### Fixed
 * Fixed exception caused by incorrect type in value converter

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.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="">
+  <package id="1" version="8.0.14" url="https://github.com/AaronSadlerUK/Umbraco.MegaNavV8" name="Umbraco.MegaNavV8" packagePath="~/media/created-packages/Umbraco.MegaNavV8_8.0.14.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/src/Our.Umbraco.MeganavV8.Core/ValueConverters/MeganavV8ValueConverter.cs b/src/Our.Umbraco.MeganavV8.Core/ValueConverters/MeganavV8ValueConverter.cs
@@ -61,7 +61,7 @@ public override object ConvertIntermediateToObject(IPublishedElement owner, IPub
             return Enumerable.Empty<MeganavV8Item>();
         }
 
-        internal IEnumerable<MeganavV8Item> BuildMenu(IEnumerable<MeganavV8Item> items, int level = 0)
+        private IEnumerable<MeganavV8Item> BuildMenu(IEnumerable<MeganavV8Item> items, int level = 0)
         {
             items = items.ToList();
 
@@ -93,6 +93,9 @@ internal IEnumerable<MeganavV8Item> BuildMenu(IEnumerable<MeganavV8Item> items,
                         {
                             item.Title = umbracoContent.Name;
                         }
+
+                        // set url to most recent from published cache
+                        item.Url = umbracoContent.Url;
                     }
                 }