Merge branch 'develop' into main

AaronSadlerUK · Jul 14, 2022 · c478665 · c478665
2 parents 5aaa2b0 + d908504
commit c478665
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 10 deletions.
diff --git a/src/UmbNav.Api/Controllers/API/UmbNavEntityApiController.cs b/src/UmbNav.Api/Controllers/API/UmbNavEntityApiController.cs
@@ -23,10 +23,6 @@ public UmbNavEntityApiController(IContentService contentService, IPublishedSnaps
 
         public IActionResult GetById(string id, string? culture = null)
         {
-            if (culture == "undefined")
-            {
-                culture = null;
-            }
             var isUdi = UdiParser.TryParse(id, out var udi);
 
             if (isUdi && udi != null)

diff --git a/src/UmbNav.Api/UmbNav.Api.csproj b/src/UmbNav.Api/UmbNav.Api.csproj
@@ -19,10 +19,10 @@
 		<Copyright>2022 UmbHost Limited</Copyright>
 		<PackageLicenseExpression>MIT</PackageLicenseExpression>
 		<PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
-		<AssemblyVersion>2.0.1</AssemblyVersion>
+		<AssemblyVersion>2.0.2</AssemblyVersion>
 		<Version>$(AssemblyVersion)</Version>
 		<PackageReadmeFile>README.md</PackageReadmeFile>
-		<PackageReleaseNotes>Fixes an issue with the link description showing as a '#' in the backoffice</PackageReleaseNotes>
+		<PackageReleaseNotes>Fixed issue with null culture</PackageReleaseNotes>
 		<Nullable>enable</Nullable>
 	</PropertyGroup>
 

diff --git a/src/UmbNav.Web/UmbNav.Web.csproj b/src/UmbNav.Web/UmbNav.Web.csproj
@@ -18,10 +18,10 @@
 		<Copyright>2022 UmbHost Limited</Copyright>
 		<PackageLicenseExpression>MIT</PackageLicenseExpression>
 		<PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
-		<AssemblyVersion>2.0.1</AssemblyVersion>
+		<AssemblyVersion>2.0.2</AssemblyVersion>
 		<Version>$(AssemblyVersion)</Version>
 		<PackageReadmeFile>README.md</PackageReadmeFile>
-		<PackageReleaseNotes>Bumps minimum dependency version for Our.UmbNav.Api to 2.0.1</PackageReleaseNotes>
+		<PackageReleaseNotes>Fixed issue with null culture</PackageReleaseNotes>
 	</PropertyGroup>
 
 
@@ -31,7 +31,7 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="6.0.6" />
-    <PackageReference Include="Our.Umbraco.UmbNav.Api" Version="2.0.1" />
+    <PackageReference Include="Our.Umbraco.UmbNav.Api" Version="2.0.2" />
     <PackageReference Include="Our.Umbraco.UmbNav.Core" Version="2.0.0" />
     <PackageReference Include="Umbraco.Cms.Core" Version="10.0.0" />
   </ItemGroup>

diff --git a/src/UmbNav.Web/wwwroot/js/umbnav.resource.js b/src/UmbNav.Web/wwwroot/js/umbnav.resource.js
@@ -1,6 +1,6 @@
 angular.module("umbraco.resources").factory("umbnavResource", function ($http, iconHelper) {
     return {
-        getById: function (id, culture) {
+        getById: function (id, culture = "") {
 
             return $http.get("backoffice/UmbNav/UmbNavEntityApi/GetById?id=" + id + "&culture=" + culture)
                 .then(function (response) {