External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-03-27 22:05:07 -02:30
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1640 from jaredevantabor/1502-AS-after-networking

Browse Source 
Fix Activity Stream after visiting the network UI
This commit is contained in:
Jared Tabor
2018-05-02 14:14:49 -07:00
committed by GitHub
parent 1d6b15a6a7 079d8e2565
commit 2baae8f75b
6 changed files with 31 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
awx/ui/client/lib/components/layout/side-nav.partial.html
View File

@@ -1,7 +1,7 @@
<div class="at-Layout-side"
ng-class="{'at-Layout-side--expanded': vm.isExpanded && layoutVm.isLoggedIn}" ng-show="layoutVm.isLoggedIn && !layoutVm.licenseIsMissing">
ng-class="{'at-Layout-side--expanded': vm.isExpanded && layoutVm.isLoggedIn}" ng-show="layoutVm.isLoggedIn && !layoutVm.licenseIsMissing && layoutVm.currentState !== 'inventories.edit.networking'">
<div class="at-Layout-sideNavItem at-Layout-sideNavToggle" ng-click="vm.toggleExpansion()"
ng-show="layoutVm.isLoggedIn && !layoutVm.licenseIsMissing">
ng-show="layoutVm.isLoggedIn && !layoutVm.licenseIsMissing && layoutVm.currentState !== 'inventories.edit.networking'">
<i class="fa fa-bars"></i>
</div>
<ng-transclude></ng-transclude>