Fix the issue that nav without rbac resource config will not show in the menu

This commit is contained in:
loganhz 2018-01-17 20:31:54 +08:00
parent 80aaf2ce00
commit e2674743b5
1 changed files with 3 additions and 3 deletions

View File

@ -14,7 +14,7 @@
{{! Has a submenu }} {{! Has a submenu }}
<li class="dropdown nav-item"> <li class="dropdown nav-item">
{{#if item.route}} {{#if item.route}}
{{#if (rbac-allows resource=item.resource scope=item.resourceScope)}} {{#if (or (not item.resource) (rbac-allows resource=item.resource scope=item.resourceScope))}}
{{#link-to-as-attrs {{#link-to-as-attrs
item.route item.route
models=item.ctx models=item.ctx
@ -40,7 +40,7 @@
<ul class="dropdown-menu" data-dropdown-id={{item.id}}> <ul class="dropdown-menu" data-dropdown-id={{item.id}}>
{{#each item.submenu as |subitem|}} {{#each item.submenu as |subitem|}}
{{#if subitem.route}} {{#if subitem.route}}
{{#if (rbac-allows resource=subitem.resource scope=subitem.resourceScope)}} {{#if (or (not subitem.resource) (rbac-allows resource=subitem.resource scope=subitem.resourceScope))}}
<li> <li>
{{#link-to-as-attrs {{#link-to-as-attrs
subitem.route subitem.route
@ -66,7 +66,7 @@
</ul> </ul>
</li> </li>
{{else if item.route}} {{else if item.route}}
{{#if (rbac-allows resource=item.resource scope=item.resourceScope)}} {{#if (or (not item.resource) (rbac-allows resource=item.resource scope=item.resourceScope))}}
{{! No submenu }} {{! No submenu }}
<li class="nav-item"> <li class="nav-item">
{{#link-to-as-attrs {{#link-to-as-attrs