Merge branch 'master' of https://github.com/aspnetboilerplate/module-zero-core-template

Author: ismcagdas

angular/src/app/layout/sidebar-nav.component.html

@@ -3,39 +3,39 @@
         <ng-template ngFor let-menuItem [ngForOf]="menuItems" let-mainMenuItemIndex="index">
             <li *ngIf="showMenuItem(menuItem)" routerLinkActive="active">
                 <!-- route name -->
-                <a [routerLink]="[menuItem.route]" *ngIf="!menuItem.items && menuItem.route.indexOf('http') != 0">
+                <a [routerLink]="[menuItem.route]" *ngIf="!menuItem.items.length && menuItem.route.indexOf('http') != 0">
                     <i *ngIf="menuItem.icon" class="material-icons">{{menuItem.icon}}</i>
                     <span>{{menuItem.name}}</span>
                 </a>
                 <!-- Static link (starts with 'http') -->
-                <a href="{{menuItem.route}}" target="_blank" *ngIf="!menuItem.items  && menuItem.route.indexOf('http') == 0">
+                <a href="{{menuItem.route}}" target="_blank" *ngIf="!menuItem.items.length && menuItem.route.indexOf('http') == 0">
                     <i *ngIf="menuItem.icon" class="material-icons">{{menuItem.icon}}</i>
                     <span>{{menuItem.name}}</span>
                 </a>
                 <!-- Has child menu items (so, this is a parent menu) -->
-                <a href="javascript:void(0);" [ngClass]="{'menu-toggle': menuItem.items.length}">
+                <a href="javascript:void(0);" [ngClass]="{'menu-toggle': menuItem.items.length}" *ngIf="menuItem.items.length">
                     <i *ngIf="menuItem.icon" class="material-icons">{{menuItem.icon}}</i>
                     <span>{{menuItem.name}}</span>
                 </a>
-                <ul class="ml-menu" *ngIf="menuItem.items">
+                <ul class="ml-menu" *ngIf="menuItem.items.length">
                     <ng-template ngFor let-subMenuItem [ngForOf]="menuItem.items" let-mainMenuItemIndex="index">
                         <li *ngIf="showMenuItem(subMenuItem)" routerLinkActive="active">
                             <!-- route name -->
-                            <a [routerLink]="[subMenuItem.route]" class="toggled" *ngIf="!subMenuItem.items && subMenuItem.route.indexOf('http') != 0">
+                            <a [routerLink]="[subMenuItem.route]" class="toggled" *ngIf="!subMenuItem.items.length && subMenuItem.route.indexOf('http') != 0">
                                 <i *ngIf="subMenuItem.icon" class="material-icons">{{subMenuItem.icon}}</i>
                                 <span>{{subMenuItem.name}}</span>
                             </a>
                             <!-- Static link (starts with 'http') -->
-                            <a href="{{subMenuItem.route}}" class="toggled" target="_blank" *ngIf="!subMenuItem.items && subMenuItem.route.indexOf('http') == 0">
+                            <a href="{{subMenuItem.route}}" class="toggled" target="_blank" *ngIf="!subMenuItem.items.length && subMenuItem.route.indexOf('http') == 0">
                                 <i *ngIf="subMenuItem.icon" class="material-icons">{{subMenuItem.icon}}</i>
                                 <span>{{subMenuItem.name}}</span>
                             </a>
                             <!-- Has child menu items (so, this is a parent menu) -->
-                            <a href="javascript:void(0);" [ngClass]="{'menu-toggle': subMenuItem.items.length}">
+                            <a href="javascript:void(0);" [ngClass]="{'menu-toggle': subMenuItem.items.length}" *ngIf="menuItem.items.length">
                                 <i *ngIf="subMenuItem.icon" class="material-icons">{{subMenuItem.icon}}</i>
                                 <span>{{subMenuItem.name}}</span>
                             </a>
-                            <ul class="ml-menu" *ngIf="subMenuItem.items">
+                            <ul class="ml-menu" *ngIf="subMenuItem.items.length">
                                 <ng-template ngFor let-subSubMenuItem [ngForOf]="subMenuItem.items" let-mainMenuItemIndex="index">
                                     <li *ngIf="showMenuItem(subSubMenuItem)" routerLinkActive="active">
                                         <!-- route name -->