mirror of
https://github.com/ansible/awx.git
synced 2026-03-18 09:27:31 -02:30
Merge pull request #3237 from mabashian/3149-adhoc-breadcrumb
Fixed bug where breadcrumb was incorrect after launching adhoc command
This commit is contained in:
@@ -19,18 +19,4 @@
|
|||||||
<li class="BreadCrumb-item" ng-if="currentState !== 'inventoryManage'"></li>
|
<li class="BreadCrumb-item" ng-if="currentState !== 'inventoryManage'"></li>
|
||||||
<div class="InventoryManageBreadCrumb-ncy" ng-if="!licenseMissing" ncy-breadcrumb></div>
|
<div class="InventoryManageBreadCrumb-ncy" ng-if="!licenseMissing" ncy-breadcrumb></div>
|
||||||
</ol>
|
</ol>
|
||||||
<div class="BreadCrumb-menuLink"
|
|
||||||
id="bread_crumb_activity_stream"
|
|
||||||
aw-tool-tip="View Activity Stream"
|
|
||||||
data-placement="left"
|
|
||||||
data-trigger="hover"
|
|
||||||
data-container="body"
|
|
||||||
ng-class="{'BreadCrumb-menuLinkActive' : activityStreamActive}"
|
|
||||||
ng-if="showActivityStreamButton"
|
|
||||||
ng-hide= "licenseMissing"
|
|
||||||
ng-click="openActivityStream()">
|
|
||||||
<i class="BreadCrumb-menuLinkImage icon-activity-stream"
|
|
||||||
alt="Activity Stream">
|
|
||||||
</i>
|
|
||||||
</div>
|
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@@ -13,11 +13,6 @@ import GroupsListController from './groups/groups-list.controller';
|
|||||||
export default {
|
export default {
|
||||||
name: 'inventoryManage',
|
name: 'inventoryManage',
|
||||||
url: '/inventories/:inventory_id/manage?{group:int}{failed}',
|
url: '/inventories/:inventory_id/manage?{group:int}{failed}',
|
||||||
data: {
|
|
||||||
activityStream: true,
|
|
||||||
activityStreamTarget: 'inventory',
|
|
||||||
activityStreamId: 'inventory_id'
|
|
||||||
},
|
|
||||||
params:{
|
params:{
|
||||||
group:{
|
group:{
|
||||||
array: true
|
array: true
|
||||||
|
|||||||
@@ -40,7 +40,7 @@
|
|||||||
<include-svg href="{{ STATIC_URL }}assets/icons.svg"></include-svg>
|
<include-svg href="{{ STATIC_URL }}assets/icons.svg"></include-svg>
|
||||||
|
|
||||||
<main-menu></main-menu>
|
<main-menu></main-menu>
|
||||||
<bread-crumb ng-if="!includesCurrentState('inventoryManage')"></bread-crumb><div ui-view="groupBreadcrumbs" ng-if="includesCurrentState('inventoryManage')"></div>
|
<bread-crumb ng-show="!includesCurrentState('inventoryManage')"></bread-crumb><div ui-view="groupBreadcrumbs" ng-show="includesCurrentState('inventoryManage')"></div>
|
||||||
<toast></toast>
|
<toast></toast>
|
||||||
|
|
||||||
<div class="container-fluid" id="content-container">
|
<div class="container-fluid" id="content-container">
|
||||||
|
|||||||
Reference in New Issue
Block a user