fix bug in bs4 side nav

cloudscribe · May 14, 2018 · 7920810 · 7920810
1 parent d5e2778
commit 7920810
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/src/cloudscribe.Web.Navigation/NavigationViewModel.cs b/src/cloudscribe.Web.Navigation/NavigationViewModel.cs
@@ -78,7 +78,7 @@ public TreeNode<NavigationNode> StartingNode
             {
                 if (startingNode == null)
                 {
-                    if (startingNodeKey.Length > 0 && startingNodeKey != "RootNode")
+                    if (!string.IsNullOrWhiteSpace(startingNodeKey) && startingNodeKey != "RootNode")
                     {
                         startingNode = RootNode.FindByKey(startingNodeKey);
                         if (startingNode == null)
@@ -306,7 +306,7 @@ private bool IsAllowedByAdjuster(TreeNode<NavigationNode> node)
         private bool FilterIsAllowed(TreeNode<NavigationNode> node)
         {
             if (string.IsNullOrEmpty(node.Value.ComponentVisibility)) { return true; }
-            if (navigationFilterName.Length == 0) { return false; }
+            if (string.IsNullOrWhiteSpace(navigationFilterName)) { return false; }
             if (node.Value.ComponentVisibility.Contains(navigationFilterName)) { return true; }
 
             return false;

diff --git a/src/cloudscribe.Web.Navigation/Views/Shared/Bs4SideNavPartial.cshtml b/src/cloudscribe.Web.Navigation/Views/Shared/Bs4SideNavPartial.cshtml
@@ -28,7 +28,7 @@
                             @Html.Raw(Model.GetIcon(childNode.Value))@childNode.Value.Text
                         </a>
                         @Model.UpdateTempNode(childNode)
-                        @Html.Partial("SideNavPartial", Model) @* recursion *@
+                        @Html.Partial("Bs4SideNavPartial", Model) @* recursion *@
                     </li>
                 }
                 else

diff --git a/src/cloudscribe.Web.Navigation/Views/Shared/Components/Navigation/Bs4SideNav.cshtml b/src/cloudscribe.Web.Navigation/Views/Shared/Components/Navigation/Bs4SideNav.cshtml
@@ -25,7 +25,7 @@
                         <li class="nav-item">
                             <a class="nav-link active" href="@Url.Content(Model.AdjustUrl(node))">@Html.Raw(Model.GetIcon(node.Value))@Model.AdjustText(node)</a>
                             @Model.UpdateTempNode(node)
-                            @Html.Partial("SideNavPartial", Model)
+                            @Html.Partial("Bs4SideNavPartial", Model)
                         </li>
                     }
                     else

diff --git a/src/cloudscribe.Web.Navigation/cloudscribe.Web.Navigation.csproj b/src/cloudscribe.Web.Navigation/cloudscribe.Web.Navigation.csproj
@@ -2,8 +2,8 @@
 
   <PropertyGroup>
     <Description>an ASP.NET Core viewcomponent for menus and breadcrumbs</Description>
-    <VersionPrefix>2.0.10</VersionPrefix>
-    <AssemblyVersion>2.0.10</AssemblyVersion>
+    <VersionPrefix>2.0.11</VersionPrefix>
+    <AssemblyVersion>2.0.11</AssemblyVersion>
     <Authors>Joe Audette</Authors>
     <TargetFrameworks>netstandard2.0</TargetFrameworks>
     <AssemblyName>cloudscribe.Web.Navigation</AssemblyName>