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

Merge pull request #4085 from mabashian/4082-inv_obj

Browse Source 
Ensure inventory_obj is on scope before checking it

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
This commit is contained in:
softwarefactory-project-zuul[bot]
2019-06-17 18:08:43 +00:00
committed by GitHub
parent 049b3a2e87 863d962ec2
commit 5ed7db8cc2
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
awx/ui/client/src/inventories-hosts/inventories/smart-inventory/edit/smart-inventory-edit.controller.js
View File

@@ -37,6 +37,8 @@ function SmartInventoryEdit($scope, $location,
$scope.parseType = 'yaml'; $scope.parseType = 'yaml';
$scope.inventory_obj = inventoryData;
$rootScope.breadcrumb.inventory_name = inventoryData.name;
ParseTypeChange({ ParseTypeChange({
scope: $scope, scope: $scope,
@@ -51,9 +53,6 @@ function SmartInventoryEdit($scope, $location,
$scope.canEditOrg = canEditOrg; $scope.canEditOrg = canEditOrg;
}); });
$scope.inventory_obj = inventoryData;
$rootScope.breadcrumb.inventory_name = inventoryData.name;
$scope.smart_hosts = { $scope.smart_hosts = {
host_filter: encodeURIComponent($scope.host_filter) host_filter: encodeURIComponent($scope.host_filter)
}; };