. Seems to be a bug in TB3 RC1
- $(this).remove();
- });
- $('.tooltip').each( function() {
- // close any lingering tool tipss
- $(this).hide();
- });
- elem.attr({
- "aw-pop-over": html,
- "data-popover-title": title,
- "data-placement": "right" });
- elem.removeAttr('ng-click');
- $compile(elem)($scope);
- $scope.triggerPopover(event);
- }
- if ($scope.removeHostSummaryReady) {
- $scope.removeHostSummaryReady();
- }
- $scope.removeHostSummaryReady = $scope.$on('HostSummaryReady', function(e, event, data) {
-
- var html, title = "Recent Jobs";
- Wait('stop');
- if (data.count > 0) {
- html = "
No recent job data available for this inventory.
\n";
+ inventory.syncStatus = 'na';
+ inventory.syncTip = 'Not configured for inventory sync.';
+ inventory.launch_class = "btn-disabled";
}
- attachElem(event, html, title);
- });
- if ($scope.removeSourceSummaryReady) {
- $scope.removeSourceSummaryReady();
+ if (inventory.has_active_failures) {
+ inventory.hostsStatus = 'error';
+ inventory.hostsTip = inventory.hosts_with_active_failures + ' hosts with failures. Click for details.';
+ }
+ else if (inventory.total_hosts) {
+ inventory.hostsStatus = 'successful';
+ inventory.hostsTip = 'No hosts with failures. Click for details.';
+ }
+ else {
+ inventory.hostsStatus = 'none';
+ inventory.hostsTip = 'Inventory contains 0 hosts.';
+ }
+
+ inventory.kind_label = inventory.kind === '' ? 'Inventory' : (inventory.kind === 'smart' ? 'Smart Inventory': 'Inventory');
}
- $scope.removeSourceSummaryReady = $scope.$on('SourceSummaryReady', function(e, event, inventory, data) {
- var html, title;
-
- Wait('stop');
-
- // Build the html for our popover
- html = "
\n";
- title = "Sync Status";
- attachElem(event, html, title);
- });
-
- $scope.showSourceSummary = function(event, id) {
- try{
- var elem = $(event.target).parent();
- // if the popover is visible already, then exit the function here
- if(elem.data()['bs.popover'].tip().hasClass('in')){
- return;
- }
- }
- catch(err){
- var inventory;
- if (!Empty(id)) {
- inventory = Find({ list: $scope.inventories, key: 'id', val: id });
- if (inventory.syncStatus !== 'na') {
- Wait('start');
- Rest.setUrl(inventory.related.inventory_sources + '?order_by=-last_job_run&page_size=5');
- Rest.get()
- .success(function(data) {
- $scope.$emit('SourceSummaryReady', event, inventory, data);
- })
- .error(function(data, status) {
- ProcessErrors( $scope, data, status, null, { hdr: 'Error!',
- msg: 'Call to ' + inventory.related.inventory_sources + ' failed. GET returned status: ' + status
- });
- });
- }
- }
- }
- };
-
- $scope.showHostSummary = function(event, id) {
- try{
- var elem = $(event.target).parent();
- // if the popover is visible already, then exit the function here
- if(elem.data()['bs.popover'].tip().hasClass('in')){
- return;
- }
- }
- catch(err){
- var url, inventory;
- if (!Empty(id)) {
- inventory = Find({ list: $scope.inventories, key: 'id', val: id });
- if (inventory.total_hosts > 0) {
- Wait('start');
- url = GetBasePath('jobs') + "?type=job&inventory=" + id + "&failed=";
- url += (inventory.has_active_failures) ? 'true' : "false";
- url += "&order_by=-finished&page_size=5";
- Rest.setUrl(url);
- Rest.get()
- .success( function(data) {
- $scope.$emit('HostSummaryReady', event, data);
- })
- .error( function(data, status) {
- ProcessErrors( $scope, data, status, null, { hdr: 'Error!',
- msg: 'Call to ' + url + ' failed. GET returned: ' + status
- });
- });
- }
- }
- }
- };
-
- $scope.viewJob = function(url) {
-
- // Pull the id out of the URL
- var id = url.replace(/^\//, '').split('/')[3];
-
- $state.go('inventorySyncStdout', {id: id});
-
- };
$scope.editInventory = function (inventory) {
if(inventory.kind && inventory.kind === 'smart') {
@@ -270,12 +78,7 @@ function InventoriesList($scope, $rootScope, $location,
}
};
- $scope.manageInventory = function(id){
- $location.path($location.path() + '/' + id + '/manage');
- };
-
$scope.deleteInventory = function (id, name) {
-
var action = function () {
var url = defaultUrl + id + '/';
Wait('start');
@@ -305,15 +108,6 @@ function InventoriesList($scope, $rootScope, $location,
});
};
- // Failed jobs link. Go to the jobs tabs, find all jobs for the inventory and sort by status
- $scope.viewJobs = function (id) {
- $location.url('/jobs/?inventory__int=' + id);
- };
-
- $scope.viewFailedJobs = function (id) {
- $location.url('/jobs/?inventory__int=' + id + '&status=failed');
- };
-
$scope.syncInventory = function(inventory) {
InventoryUpdate({
scope: $scope,
@@ -323,8 +117,8 @@ function InventoriesList($scope, $rootScope, $location,
};
}
-export default ['$scope', '$rootScope', '$location',
- '$compile', '$filter', 'Rest', 'InventoryList', 'Prompt',
- 'ProcessErrors', 'GetBasePath', 'Wait', 'Find', 'Empty',
- '$state', 'rbacUiControlService', 'Dataset', 'InventoryUpdate', InventoriesList
+export default ['$scope',
+ '$filter', 'Rest', 'InventoryList', 'Prompt',
+ 'ProcessErrors', 'GetBasePath', 'Wait',
+ '$state', 'Dataset', 'InventoryUpdate', 'canAdd', InventoriesList
];
diff --git a/awx/ui/client/src/inventories/list/main.js b/awx/ui/client/src/inventories/list/main.js
index 11c6e4e694..4df9ff834f 100644
--- a/awx/ui/client/src/inventories/list/main.js
+++ b/awx/ui/client/src/inventories/list/main.js
@@ -5,7 +5,12 @@
*************************************************/
import controller from './inventory-list.controller';
+import hostSummaryPopover from './host-summary-popover/main';
+import sourceSummaryPopover from './source-summary-popover/main';
export default
-angular.module('InventoryList', [])
+angular.module('InventoryList', [
+ hostSummaryPopover.name,
+ sourceSummaryPopover.name
+ ])
.controller('InventoryListController', controller);
diff --git a/awx/ui/client/src/inventories/list/source-summary-popover/main.js b/awx/ui/client/src/inventories/list/source-summary-popover/main.js
new file mode 100644
index 0000000000..4b6659f510
--- /dev/null
+++ b/awx/ui/client/src/inventories/list/source-summary-popover/main.js
@@ -0,0 +1,7 @@
+import directive from './source-summary-popover.directive';
+import controller from './source-summary-popover.controller';
+
+export default
+angular.module('SourceSummaryPopoverModule', [])
+ .directive('sourceSummaryPopover', directive)
+ .controller('SourceSummaryPopoverController', controller);
diff --git a/awx/ui/client/src/inventories/list/source-summary-popover/source-summary-popover.controller.js b/awx/ui/client/src/inventories/list/source-summary-popover/source-summary-popover.controller.js
new file mode 100644
index 0000000000..0b32903df8
--- /dev/null
+++ b/awx/ui/client/src/inventories/list/source-summary-popover/source-summary-popover.controller.js
@@ -0,0 +1,27 @@
+export default [ '$scope', 'Wait', 'Empty', 'Rest', 'ProcessErrors', '$state',
+ function($scope, Wait, Empty, Rest, ProcessErrors, $state) {
+
+ $scope.gatherSourceJobs = function(event) {
+ if (!Empty($scope.inventory.id)) {
+ Wait('start');
+ Rest.setUrl($scope.inventory.related.inventory_sources + '?order_by=-last_job_run&page_size=5');
+ Rest.get()
+ .success(function(data) {
+ $scope.generateTable(data, event);
+ })
+ .error(function(data, status) {
+ ProcessErrors( $scope, data, status, null, { hdr: 'Error!',
+ msg: 'Call to ' + $scope.inventory.related.inventory_sources + ' failed. GET returned status: ' + status
+ });
+ });
+ }
+ };
+
+ $scope.viewJob = function(url) {
+ // Pull the id out of the URL
+ var id = url.replace(/^\//, '').split('/')[3];
+ $state.go('inventorySyncStdout', {id: id});
+ };
+
+ }
+];
diff --git a/awx/ui/client/src/inventories/list/source-summary-popover/source-summary-popover.directive.js b/awx/ui/client/src/inventories/list/source-summary-popover/source-summary-popover.directive.js
new file mode 100644
index 0000000000..1d40d15593
--- /dev/null
+++ b/awx/ui/client/src/inventories/list/source-summary-popover/source-summary-popover.directive.js
@@ -0,0 +1,98 @@
+export default ['templateUrl', '$compile', 'Wait', '$filter',
+ function(templateUrl, $compile, Wait, $filter) {
+ return {
+ restrict: 'E',
+ replace: false,
+ scope: {
+ inventory: '='
+ },
+ controller: 'SourceSummaryPopoverController',
+ templateUrl: templateUrl('inventories/list/source-summary-popover/source-summary-popover'),
+ link: function(scope) {
+
+ function ellipsis(a) {
+ if (a.length > 20) {
+ return a.substr(0,20) + '...';
+ }
+ return a;
+ }
+
+ function attachElem(event, html, title) {
+ var elem = $(event.target).parent();
+ try {
+ elem.tooltip('hide');
+ elem.popover('destroy');
+ }
+ catch(err) {
+ //ignore
+ }
+ $('.popover').each(function() {
+ // remove lingering popover
. Seems to be a bug in TB3 RC1
+ $(this).remove();
+ });
+ $('.tooltip').each( function() {
+ // close any lingering tool tipss
+ $(this).hide();
+ });
+ elem.attr({
+ "aw-pop-over": html,
+ "data-popover-title": title,
+ "data-placement": "right" });
+ elem.removeAttr('ng-click');
+ $compile(elem)(scope);
+ scope.triggerPopover(event);
+ }
+
+ scope.generateTable = function(data, event) {
+ var html, title;
+
+ Wait('stop');
+
+ // Build the html for our popover
+ html = "
\n";
+ html += "\n";
+ html += "";
+ html += "| Status | ";
+ html += "Last Sync | ";
+ html += "Source | ";
+ html += "
";
+ html += "\n";
+ html += "\n";
+ data.results.forEach( function(row) {
+ if (row.related.last_update) {
+ html += "";
+ html += ` | `;
+ html += "" + ($filter('longDate')(row.last_updated)) + " | ";
+ html += "" + $filter('sanitize')(ellipsis(row.name)) + " | ";
+ html += "
\n";
+ }
+ else {
+ html += "";
+ html += " | ";
+ html += "NA | ";
+ html += "" + $filter('sanitize')(ellipsis(row.name)) + " | ";
+ html += "
\n";
+ }
+ });
+ html += "\n";
+ html += "
\n";
+ title = "Sync Status";
+ attachElem(event, html, title);
+ };
+
+ scope.showSourceSummary = function(event) {
+ try{
+ var elem = $(event.target).parent();
+ // if the popover is visible already, then exit the function here
+ if(elem.data()['bs.popover'].tip().hasClass('in')){
+ return;
+ }
+ }
+ catch(err){
+ scope.gatherSourceJobs(event);
+ }
+ };
+ }
+ };
+ }
+];
diff --git a/awx/ui/client/src/inventories/list/source-summary-popover/source-summary-popover.partial.html b/awx/ui/client/src/inventories/list/source-summary-popover/source-summary-popover.partial.html
new file mode 100644
index 0000000000..87fd35ef00
--- /dev/null
+++ b/awx/ui/client/src/inventories/list/source-summary-popover/source-summary-popover.partial.html
@@ -0,0 +1,3 @@
+
+
+
diff --git a/awx/ui/client/src/inventories/main.js b/awx/ui/client/src/inventories/main.js
index ae85f2fd54..5e361587d4 100644
--- a/awx/ui/client/src/inventories/main.js
+++ b/awx/ui/client/src/inventories/main.js
@@ -84,6 +84,19 @@ angular.module('inventory', [
form: 'InventoryForm',
controllers: {
add: 'InventoryAddController'
+ },
+ resolve: {
+ add: {
+ canAdd: ['rbacUiControlService', '$state', function(rbacUiControlService, $state) {
+ return rbacUiControlService.canAdd('inventory')
+ .then(function(res) {
+ return res.canAdd;
+ })
+ .catch(function() {
+ $state.go('inventories');
+ });
+ }]
+ }
}
});
@@ -107,6 +120,19 @@ angular.module('inventory', [
form: 'smartInventoryForm',
controllers: {
add: 'SmartInventoryAddController'
+ },
+ resolve: {
+ add: {
+ canAdd: ['rbacUiControlService', '$state', function(rbacUiControlService, $state) {
+ return rbacUiControlService.canAdd('inventory')
+ .then(function(res) {
+ return res.canAdd;
+ })
+ .catch(function() {
+ $state.go('inventories');
+ });
+ }]
+ }
}
});
@@ -268,6 +294,17 @@ angular.module('inventory', [
return Rest.get();
}
]
+ },
+ list: {
+ canAdd: ['rbacUiControlService', function(rbacUiControlService) {
+ return rbacUiControlService.canAdd('hosts')
+ .then(function(res) {
+ return res.canAdd;
+ })
+ .catch(function() {
+ return false;
+ });
+ }]
}
},
views: {
diff --git a/awx/ui/client/src/inventories/related-hosts/add/host-add.controller.js b/awx/ui/client/src/inventories/related-hosts/add/host-add.controller.js
index 966d3c351b..1247d73979 100644
--- a/awx/ui/client/src/inventories/related-hosts/add/host-add.controller.js
+++ b/awx/ui/client/src/inventories/related-hosts/add/host-add.controller.js
@@ -5,19 +5,14 @@
*************************************************/
export default ['$state', '$stateParams', '$scope', 'RelatedHostsFormDefinition', 'ParseTypeChange',
- 'GenerateForm', 'HostManageService', 'rbacUiControlService', 'GetBasePath', 'ToJSON',
+ 'GenerateForm', 'HostManageService', 'rbacUiControlService', 'GetBasePath', 'ToJSON', 'canAdd',
function($state, $stateParams, $scope, RelatedHostsFormDefinition, ParseTypeChange,
- GenerateForm, HostManageService, rbacUiControlService, GetBasePath, ToJSON) {
+ GenerateForm, HostManageService, rbacUiControlService, GetBasePath, ToJSON, canAdd) {
init();
function init() {
- $scope.canAdd = false;
-
- rbacUiControlService.canAdd(GetBasePath('inventory') + $stateParams.inventory_id + "/hosts")
- .then(function(canAdd) {
- $scope.canAdd = canAdd;
- });
+ $scope.canAdd = canAdd;
$scope.parseType = 'yaml';
$scope.host = { enabled: true };
// apply form definition's default field values
diff --git a/awx/ui/client/src/inventories/related-hosts/list/host-list.controller.js b/awx/ui/client/src/inventories/related-hosts/list/host-list.controller.js
index 6a9b41bbcb..b02c9cbf43 100644
--- a/awx/ui/client/src/inventories/related-hosts/list/host-list.controller.js
+++ b/awx/ui/client/src/inventories/related-hosts/list/host-list.controller.js
@@ -7,24 +7,19 @@
// import HostManageService from './../hosts/host.service';
export default ['$scope', 'ListDefinition', '$rootScope', 'GetBasePath',
'rbacUiControlService', 'Dataset', '$state', '$filter', 'Prompt', 'Wait',
- 'HostManageService', 'SetStatus',
+ 'HostManageService', 'SetStatus', 'canAdd',
function($scope, ListDefinition, $rootScope, GetBasePath,
rbacUiControlService, Dataset, $state, $filter, Prompt, Wait,
- HostManageService, SetStatus) {
+ HostManageService, SetStatus, canAdd) {
let list = ListDefinition;
init();
function init(){
- $scope.canAdd = false;
+ $scope.canAdd = canAdd;
$scope.enableSmartInventoryButton = false;
- rbacUiControlService.canAdd('hosts')
- .then(function(canAdd) {
- $scope.canAdd = canAdd;
- });
-
// Search init
$scope.list = list;
$scope[`${list.iterator}_dataset`] = Dataset.data;
diff --git a/awx/ui/client/src/inventories/related-hosts/related-host.route.js b/awx/ui/client/src/inventories/related-hosts/related-host.route.js
index 9ffb1e5f5e..b3ea2da30c 100644
--- a/awx/ui/client/src/inventories/related-hosts/related-host.route.js
+++ b/awx/ui/client/src/inventories/related-hosts/related-host.route.js
@@ -69,6 +69,15 @@ export default {
}],
inventoryData: ['InventoryManageService', '$stateParams', function(InventoryManageService, $stateParams) {
return InventoryManageService.getInventory($stateParams.inventory_id).then(res => res.data);
+ }],
+ canAdd: ['rbacUiControlService', function(rbacUiControlService) {
+ return rbacUiControlService.canAdd('hosts')
+ .then(function(res) {
+ return res.canAdd;
+ })
+ .catch(function() {
+ return false;
+ });
}]
}
};
diff --git a/awx/ui/client/src/inventories/smart-inventory/add/smart-inventory-add.controller.js b/awx/ui/client/src/inventories/smart-inventory/add/smart-inventory-add.controller.js
index 9f044877c5..b390dbe606 100644
--- a/awx/ui/client/src/inventories/smart-inventory/add/smart-inventory-add.controller.js
+++ b/awx/ui/client/src/inventories/smart-inventory/add/smart-inventory-add.controller.js
@@ -13,22 +13,9 @@
function SmartInventoryAdd($scope, $location,
GenerateForm, smartInventoryForm, rbacUiControlService, Rest, Alert, ProcessErrors,
ClearScope, GetBasePath, ParseTypeChange, Wait, ToJSON,
- $state) {
+ $state, canAdd) {
- $scope.canAdd = false;
- rbacUiControlService.canAdd(GetBasePath('inventory'))
- .then(function(canAdd) {
- $scope.canAdd = canAdd;
- });
-
- Rest.setUrl(GetBasePath('inventory'));
- Rest.options()
- .success(function(data) {
- if (!data.actions.POST) {
- $state.go("^");
- Alert('Permission Error', 'You do not have permission to add an inventory.', 'alert-info');
- }
- });
+ $scope.canAdd = canAdd;
ClearScope();
@@ -104,5 +91,5 @@ function SmartInventoryAdd($scope, $location,
export default ['$scope', '$location',
'GenerateForm', 'smartInventoryForm', 'rbacUiControlService', 'Rest', 'Alert',
'ProcessErrors', 'ClearScope', 'GetBasePath', 'ParseTypeChange',
- 'Wait', 'ToJSON', '$state', SmartInventoryAdd
+ 'Wait', 'ToJSON', '$state', 'canAdd', SmartInventoryAdd
];
diff --git a/awx/ui/client/src/inventories/sources/add/sources-add.controller.js b/awx/ui/client/src/inventories/sources/add/sources-add.controller.js
index 870125a87d..9b5c31aed0 100644
--- a/awx/ui/client/src/inventories/sources/add/sources-add.controller.js
+++ b/awx/ui/client/src/inventories/sources/add/sources-add.controller.js
@@ -5,12 +5,14 @@
*************************************************/
export default ['$state', '$stateParams', '$scope', 'SourcesFormDefinition',
- 'ParseTypeChange', 'GenerateForm', 'inventoryData', 'GetChoices', 'GetBasePath', 'CreateSelect2', 'GetSourceTypeOptions', 'Empty',
- 'rbacUiControlService', 'ToJSON', 'SourcesService', 'Wait', 'Rest', 'Alert', 'ProcessErrors',
+ 'ParseTypeChange', 'GenerateForm', 'inventoryData', 'GroupManageService',
+ 'GetChoices', 'GetBasePath', 'CreateSelect2', 'GetSourceTypeOptions',
+ 'rbacUiControlService', 'ToJSON', 'SourcesService', 'canAdd', 'Empty',
+ 'Wait', 'Rest', 'Alert', 'ProcessErrors',
function($state, $stateParams, $scope, SourcesFormDefinition, ParseTypeChange,
- GenerateForm, inventoryData, GetChoices,
- GetBasePath, CreateSelect2, GetSourceTypeOptions, Empty, rbacUiControlService,
- ToJSON, SourcesService, Wait, Rest, Alert, ProcessErrors) {
+ GenerateForm, inventoryData, GroupManageService, GetChoices,
+ GetBasePath, CreateSelect2, GetSourceTypeOptions, rbacUiControlService,
+ ToJSON, SourcesService, canAdd, Empty, Wait, Rest, Alert, ProcessErrors) {
let form = SourcesFormDefinition;
init();
@@ -18,12 +20,8 @@ export default ['$state', '$stateParams', '$scope', 'SourcesFormDefinition',
function init() {
// apply form definition's default field values
GenerateForm.applyDefaults(form, $scope);
-
- rbacUiControlService.canAdd(GetBasePath('inventory') + $stateParams.inventory_id + "/inventory_sources")
- .then(function(canAdd) {
- $scope.canAdd = canAdd;
- });
-
+ $scope.canAdd = canAdd;
+ $scope.envParseType = 'yaml';
initSources();
}
diff --git a/awx/ui/client/src/inventories/sources/add/sources-add.route.js b/awx/ui/client/src/inventories/sources/add/sources-add.route.js
index 40b8bdcc75..bf5c878312 100644
--- a/awx/ui/client/src/inventories/sources/add/sources-add.route.js
+++ b/awx/ui/client/src/inventories/sources/add/sources-add.route.js
@@ -19,4 +19,15 @@ export default {
controller: 'SourcesAddController'
}
},
+ resolve: {
+ canAdd: ['rbacUiControlService', 'GetBasePath', '$stateParams', function(rbacUiControlService, GetBasePath, $stateParams) {
+ return rbacUiControlService.canAdd(GetBasePath('inventory') + $stateParams.inventory_id + "/inventory_sources")
+ .then(function(res) {
+ return res.canAdd;
+ })
+ .catch(function() {
+ return false;
+ });
+ }]
+ }
};
diff --git a/awx/ui/client/src/inventories/sources/edit/sources-edit.controller.js b/awx/ui/client/src/inventories/sources/edit/sources-edit.controller.js
index 0c354958cb..e396e1cf28 100644
--- a/awx/ui/client/src/inventories/sources/edit/sources-edit.controller.js
+++ b/awx/ui/client/src/inventories/sources/edit/sources-edit.controller.js
@@ -5,20 +5,20 @@
*************************************************/
export default ['$state', '$stateParams', '$scope', 'ParseVariableString',
- 'rbacUiControlService', 'ToJSON', 'ParseTypeChange', 'GetChoices', 'GetBasePath', 'CreateSelect2', 'GetSourceTypeOptions',
- 'inventorySourceData', 'SourcesService', 'inventoryData', 'Empty', 'Wait', 'Rest', 'Alert', 'ProcessErrors',
+ 'rbacUiControlService', 'ToJSON', 'ParseTypeChange', 'GroupManageService',
+ 'GetChoices', 'GetBasePath', 'CreateSelect2', 'GetSourceTypeOptions',
+ 'inventorySourceData', 'SourcesService', 'inventoryData', 'canAdd', 'Empty',
+ 'Wait', 'Rest', 'Alert', 'ProcessErrors',
function($state, $stateParams, $scope, ParseVariableString,
- rbacUiControlService, ToJSON,ParseTypeChange, GetChoices, GetBasePath, CreateSelect2, GetSourceTypeOptions,
- inventorySourceData, SourcesService, inventoryData, Empty, Wait, Rest, Alert, ProcessErrors) {
+ rbacUiControlService, ToJSON,ParseTypeChange, GroupManageService,
+ GetChoices, GetBasePath, CreateSelect2, GetSourceTypeOptions,
+ inventorySourceData, SourcesService, inventoryData, canAdd, Empty,
+ Wait, Rest, Alert, ProcessErrors) {
init();
function init() {
- rbacUiControlService.canAdd(GetBasePath('inventory') + $stateParams.inventory_id + "/inventory_sources")
- .then(function(canAdd) {
- $scope.canAdd = canAdd;
- });
-
+ $scope.canAdd = canAdd;
// instantiate expected $scope values from inventorySourceData
_.assign($scope,
{credential: inventorySourceData.credential},
diff --git a/awx/ui/client/src/inventories/sources/edit/sources-edit.route.js b/awx/ui/client/src/inventories/sources/edit/sources-edit.route.js
index 03904159da..21d289f1dc 100644
--- a/awx/ui/client/src/inventories/sources/edit/sources-edit.route.js
+++ b/awx/ui/client/src/inventories/sources/edit/sources-edit.route.js
@@ -22,6 +22,15 @@ export default {
resolve: {
inventorySourceData: ['$stateParams', 'SourcesService', function($stateParams, SourcesService) {
return SourcesService.get({id: $stateParams.inventory_source_id }).then(res => res.data.results[0]);
+ }],
+ canAdd: ['rbacUiControlService', 'GetBasePath', '$stateParams', function(rbacUiControlService, GetBasePath, $stateParams) {
+ return rbacUiControlService.canAdd(GetBasePath('inventory') + $stateParams.inventory_id + "/inventory_sources")
+ .then(function(res) {
+ return res.canAdd;
+ })
+ .catch(function() {
+ return false;
+ });
}]
}
};
diff --git a/awx/ui/client/src/inventories/sources/list/sources-list.controller.js b/awx/ui/client/src/inventories/sources/list/sources-list.controller.js
index 0d9cc7c706..1e3457bd84 100644
--- a/awx/ui/client/src/inventories/sources/list/sources-list.controller.js
+++ b/awx/ui/client/src/inventories/sources/list/sources-list.controller.js
@@ -8,12 +8,12 @@
'InventoryUpdate', 'CancelSourceUpdate',
'ViewUpdateStatus', 'rbacUiControlService', 'GetBasePath',
'GetSyncStatusMsg', 'Dataset', 'Find', 'QuerySet',
- 'inventoryData', '$filter', 'Prompt', 'Wait', 'SourcesService', 'inventorySourceOptions',
+ 'inventoryData', '$filter', 'Prompt', 'Wait', 'SourcesService', 'inventorySourceOptions', 'canAdd',
function($scope, $rootScope, $state, $stateParams, SourcesListDefinition,
InventoryUpdate, CancelSourceUpdate,
ViewUpdateStatus, rbacUiControlService, GetBasePath, GetSyncStatusMsg,
Dataset, Find, qs, inventoryData, $filter, Prompt,
- Wait, SourcesService, inventorySourceOptions){
+ Wait, SourcesService, inventorySourceOptions, canAdd){
let list = SourcesListDefinition;
var inventory_source;
@@ -23,12 +23,7 @@
function init(){
$scope.inventory_id = $stateParams.inventory_id;
$scope.canAdhoc = inventoryData.summary_fields.user_capabilities.adhoc;
- $scope.canAdd = false;
-
- rbacUiControlService.canAdd(GetBasePath('inventory') + $scope.inventory_id + "/inventory_sources")
- .then(function(canAdd) {
- $scope.canAdd = canAdd;
- });
+ $scope.canAdd = canAdd;
// Search init
$scope.list = list;
diff --git a/awx/ui/client/src/inventories/sources/list/sources-list.route.js b/awx/ui/client/src/inventories/sources/list/sources-list.route.js
index b00085b824..1985469b0c 100644
--- a/awx/ui/client/src/inventories/sources/list/sources-list.route.js
+++ b/awx/ui/client/src/inventories/sources/list/sources-list.route.js
@@ -60,6 +60,15 @@ export default {
],
inventoryData: ['InventoryManageService', '$stateParams', function(InventoryManageService, $stateParams) {
return InventoryManageService.getInventory($stateParams.inventory_id).then(res => res.data);
+ }],
+ canAdd: ['rbacUiControlService', 'GetBasePath', '$stateParams', function(rbacUiControlService, GetBasePath, $stateParams) {
+ return rbacUiControlService.canAdd(GetBasePath('inventory') + $stateParams.inventory_id + "/inventory_sources")
+ .then(function(res) {
+ return res.canAdd;
+ })
+ .catch(function() {
+ return false;
+ });
}]
}
};
diff --git a/awx/ui/client/src/inventories/standard/add/inventory-add.controller.js b/awx/ui/client/src/inventories/standard/add/inventory-add.controller.js
index 7fb71a9edb..95748d99b7 100644
--- a/awx/ui/client/src/inventories/standard/add/inventory-add.controller.js
+++ b/awx/ui/client/src/inventories/standard/add/inventory-add.controller.js
@@ -13,22 +13,9 @@
function InventoriesAdd($scope, $location,
GenerateForm, InventoryForm, rbacUiControlService, Rest, Alert, ProcessErrors,
ClearScope, GetBasePath, ParseTypeChange, Wait, ToJSON,
- $state) {
+ $state, canAdd) {
- $scope.canAdd = false;
- rbacUiControlService.canAdd(GetBasePath('inventory'))
- .then(function(params) {
- $scope.canAdd = params.canAdd;
- });
-
- Rest.setUrl(GetBasePath('inventory'));
- Rest.options()
- .success(function(data) {
- if (!data.actions.POST) {
- $state.go("^");
- Alert('Permission Error', 'You do not have permission to add an inventory.', 'alert-info');
- }
- });
+ $scope.canAdd = canAdd;
ClearScope();
@@ -98,5 +85,5 @@ function InventoriesAdd($scope, $location,
export default ['$scope', '$location',
'GenerateForm', 'InventoryForm', 'rbacUiControlService', 'Rest', 'Alert',
'ProcessErrors', 'ClearScope', 'GetBasePath', 'ParseTypeChange',
- 'Wait', 'ToJSON', '$state', InventoriesAdd
+ 'Wait', 'ToJSON', '$state', 'canAdd', InventoriesAdd
];
diff --git a/awx/ui/client/src/organizations/linkout/controllers/organizations-inventories.controller.js b/awx/ui/client/src/organizations/linkout/controllers/organizations-inventories.controller.js
index dba089c13b..cd2a8508df 100644
--- a/awx/ui/client/src/organizations/linkout/controllers/organizations-inventories.controller.js
+++ b/awx/ui/client/src/organizations/linkout/controllers/organizations-inventories.controller.js
@@ -239,10 +239,6 @@ export default ['$scope', '$rootScope', '$location',
$state.go('inventories.edit', { inventory_id: id });
};
- $scope.manageInventory = function(id) {
- $location.path($location.path() + '/' + id + '/manage');
- };
-
// Failed jobs link. Go to the jobs tabs, find all jobs for the inventory and sort by status
$scope.viewJobs = function(id) {
$location.url('/jobs/?inventory__int=' + id);
diff --git a/awx/ui/client/src/shared/generator-helpers.js b/awx/ui/client/src/shared/generator-helpers.js
index 5fc307f191..5d47c6ca59 100644
--- a/awx/ui/client/src/shared/generator-helpers.js
+++ b/awx/ui/client/src/shared/generator-helpers.js
@@ -552,116 +552,123 @@ angular.module('GeneratorHelpers', [systemStatus.name])
html += (field.awEllipsis) ? "aw-ellipsis " : "";
html += ">\n";
- // Add ngShow
- html += (field.ngShow) ? "
" : "";
-
- //Add ngHide
- //html += (field.ngHide) ? "" : "";
-
- // Badge
- if (options.mode !== 'lookup' && (field.badges || (field.badgeIcon && field.badgePlacement && field.badgePlacement === 'left'))) {
- html += Badge(field);
+ if(field.template) {
+ html += field.template;
}
+ else {
- // Add collapse/expand icon --used on job_events page
- if (list.hasChildren && field.hasChildren) {
- html += "";
- }
+ // Add ngShow
+ html += (field.ngShow) ? "" : "";
- if (list.name === 'groups') {
- html += "";
- }
- if (list.name === 'hosts') {
- html += "
";
- }
+ //Add ngHide
+ //html += (field.ngHide) ? "
" : "";
- // Start the Link
- if ((field.key || field.link || field.linkTo || field.ngClick || field.ngHref || field.awToolTip || field.awPopOver) &&
- options.mode !== 'lookup' && options.mode !== 'select' && !field.noLink && !field.ngBindHtml) {
- if(field.noLink === true){
- // provide an override here in case we want key=true for sorting purposes but don't want links -- see: portal mode,
+ // Badge
+ if (options.mode !== 'lookup' && (field.badges || (field.badgeIcon && field.badgePlacement && field.badgePlacement === 'left'))) {
+ html += Badge(field);
}
- else if (field.icons) {
- field.icons.forEach(function(icon, idx) {
- var key, i = field.icons[idx];
- for (key in i) {
- field[key] = i[key];
- }
+
+ // Add collapse/expand icon --used on job_events page
+ if (list.hasChildren && field.hasChildren) {
+ html += "";
+ }
+
+ if (list.name === 'groups') {
+ html += "";
+ }
+ if (list.name === 'hosts') {
+ html += "
";
+ }
+
+ // Start the Link
+ if ((field.key || field.link || field.linkTo || field.ngClick || field.ngHref || field.awToolTip || field.awPopOver) &&
+ options.mode !== 'lookup' && options.mode !== 'select' && !field.noLink && !field.ngBindHtml) {
+ if(field.noLink === true){
+ // provide an override here in case we want key=true for sorting purposes but don't want links -- see: portal mode,
+ }
+ else if (field.icons) {
+ field.icons.forEach(function(icon, idx) {
+ var key, i = field.icons[idx];
+ for (key in i) {
+ field[key] = i[key];
+ }
+ html += BuildLink({
+ list: list,
+ field: field,
+ fld: fld,
+ base: field.linkBase || base
+ }) + ' ';
+ });
+ }
+ else if(field.smartStatus){
+ html += '
';
+ }
+ else {
html += BuildLink({
list: list,
field: field,
fld: fld,
base: field.linkBase || base
- }) + ' ';
- });
- }
- else if(field.smartStatus){
- html += '
';
+ });
+ }
}
else {
- html += BuildLink({
- list: list,
- field: field,
- fld: fld,
- base: field.linkBase || base
- });
- }
- }
- else {
- if(field.simpleTip) {
- html += `
`;
- }
- // Add icon:
- if (field.ngShowIcon) {
- html += " ";
- } else if (field.icon) {
- html += Icon(field.icon) + " ";
- }
- // Add data binds
- if (!field.ngBindHtml && !field.iconOnly && (field.showValue === undefined || field.showValue === true)) {
- if (field.ngBind) {
- html += "{{ " + field.ngBind;
- } else {
- html += "{{ " + list.iterator + "." + fld;
+ if(field.simpleTip) {
+ html += ``;
}
- if (field.filter) {
- html += " | " + field.filter + " }}";
+ // Add icon:
+ if (field.ngShowIcon) {
+ html += " ";
+ } else if (field.icon) {
+ html += Icon(field.icon) + " ";
}
- else {
- html += " }}";
+ // Add data binds
+ if (!field.ngBindHtml && !field.iconOnly && (field.showValue === undefined || field.showValue === true)) {
+ if (field.ngBind) {
+ html += "{{ " + field.ngBind;
+ } else {
+ html += "{{ " + list.iterator + "." + fld;
+ }
+ if (field.filter) {
+ html += " | " + field.filter + " }}";
+ }
+ else {
+ html += " }}";
+ }
+ }
+ // Add additional text:
+ if (field.text) {
+ html += field.text;
+ }
+ if(field.simpleTip) {
+ html += ``;
}
}
- // Add additional text:
- if (field.text) {
- html += field.text;
+
+ if (list.name === 'hosts' || list.name === 'groups') {
+ html += "";
}
- if(field.simpleTip) {
- html += ``;
+
+ // close ngShow
+ html += (field.ngShow) ? "" : "";
+
+ //close ngHide
+ //html += (field.ngHide) ? "" : "";
+
+ // Specific to Job Events page -showing event detail/results
+ html += (field.appendHTML) ? "
\n" : "";
+
+ // Badge
+ if (options.mode !== 'lookup' && field.badgeIcon && field.badgePlacement && field.badgePlacement !== 'left') {
+ html += Badge(field);
}
}
- if (list.name === 'hosts' || list.name === 'groups') {
- html += "
" : "";
-
- //close ngHide
- //html += (field.ngHide) ? "" : "";
-
- // Specific to Job Events page -showing event detail/results
- html += (field.appendHTML) ? "
\n" : "";
-
- // Badge
- if (options.mode !== 'lookup' && field.badgeIcon && field.badgePlacement && field.badgePlacement !== 'left') {
- html += Badge(field);
- }
}
return html += "\n";
};
diff --git a/awx/ui/client/src/smart-status/smart-status.block.less b/awx/ui/client/src/smart-status/smart-status.block.less
index 233c4a839f..b09429243d 100644
--- a/awx/ui/client/src/smart-status/smart-status.block.less
+++ b/awx/ui/client/src/smart-status/smart-status.block.less
@@ -62,7 +62,7 @@
}
-.SmartStatus-tooltip--failed{
+.SmartStatus-tooltip--error, .SmartStatus-tooltip--failed{
color: @default-err;
padding-right: 0px;
text-shadow: