Merge branch 'v8/develop'

AaronSadlerUK · Oct 14, 2020 · fa9a5ee · fa9a5ee
2 parents 040cb33 + 07f2090
commit fa9a5ee
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 5 deletions.
diff --git a/Builds/MegaNavV8_8.1.2.zip b/Builds/MegaNavV8_8.1.2.zip
diff --git a/Builds/NuGet/AaronSadler.MegaNavV8.Web.nuspec b/Builds/NuGet/AaronSadler.MegaNavV8.Web.nuspec
@@ -2,7 +2,7 @@
 <package >
   <metadata>
     <id>AaronSadler.MegaNavV8.Web</id>
-    <version>8.1.1</version>
+    <version>8.1.2</version>
     <title>Umbraco.MegaNavV8.Web</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[Breaking Changes: Updated namespaces to align with current project name, Updated the project alias to align with the current project name]]></releaseNotes>
+    <releaseNotes><![CDATA[Fixed issue where a new mega nav requires as string, but an object is passed. - Pull Request #13, Thanks auroris!]]></releaseNotes>
     <copyright>Copyright 2020</copyright>
     <tags>umbraco, umbraco-cms, MegaNav, MegaNav-V8</tags>
 	<dependencies>

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,10 @@
 # Change Log
 All notable changes to this project will be documented in this file.
 
+## [8.1.2] - 2020-10-02
+### Fixed
+Fixed issue where a new mega nav requires as string, but an object is passed. - Pull Request #13, Thanks auroris!
+
 ## [8.1.1] - 2020-10-02
 ### Fixed
 Included correct DLLs

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.1.1" url="https://github.com/AaronSadlerUK/Umbraco.MegaNavV8" name="MegaNavV8" packagePath="~/media/created-packages/MegaNavV8_8.1.1.zip" iconUrl="https://raw.githubusercontent.com/AaronSadlerUK/Umbraco.MegaNavV8/master/Builds/MegaNavV8-Logo.png" umbVersion="8.6.0" packageGuid="5fd927ea-0974-4f9e-b899-5e55c3829728" view="">
+  <package id="1" version="8.1.2" url="https://github.com/AaronSadlerUK/Umbraco.MegaNavV8" name="MegaNavV8" packagePath="~/media/created-packages/MegaNavV8_8.1.2.zip" iconUrl="https://raw.githubusercontent.com/AaronSadlerUK/Umbraco.MegaNavV8/master/Builds/MegaNavV8-Logo.png" umbVersion="8.6.0" packageGuid="5fd927ea-0974-4f9e-b899-5e55c3829728" view="">
     <license url="http://opensource.org/licenses/MIT"><![CDATA[MIT License]]></license>
     <author url="https://aaronsadler.dev"><![CDATA[Aaron Sadler, Callum Whyte]]></author>
     <contributors>

diff --git a/TestSite/App_Plugins/MeganavV8/Js/meganavv8.controller.js b/TestSite/App_Plugins/MeganavV8/Js/meganavv8.controller.js
@@ -78,7 +78,7 @@
                     model.target.anchor = (model.target.anchor.indexOf('=') === -1 ? '#' : '?') + model.target.anchor;
                 }
                 if (model.target.udi) {
-                    meganavV8Resource.getById(model.target.udi, { cultureName: $routeParams.cculture ? $routeParams.cculture : $routeParams.mculture })
+                    meganavV8Resource.getById(model.target.udi, $routeParams.cculture ? $routeParams.cculture : $routeParams.mculture)
                         .then(function (response) {
                             // merge metadata
                             angular.extend(model.target, response.data);

diff --git a/src/AaronSadler.MegaNavV8.Web/Web/UI/App_Plugins/MeganavV8/Js/meganavv8.controller.js b/src/AaronSadler.MegaNavV8.Web/Web/UI/App_Plugins/MeganavV8/Js/meganavv8.controller.js
@@ -78,7 +78,7 @@
                     model.target.anchor = (model.target.anchor.indexOf('=') === -1 ? '#' : '?') + model.target.anchor;
                 }
                 if (model.target.udi) {
-                    meganavV8Resource.getById(model.target.udi, { cultureName: $routeParams.cculture ? $routeParams.cculture : $routeParams.mculture })
+                    meganavV8Resource.getById(model.target.udi, $routeParams.cculture ? $routeParams.cculture : $routeParams.mculture)
                         .then(function (response) {
                             // merge metadata
                             angular.extend(model.target, response.data);