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

making request for inventory information

Browse Source 
for remediation flow
This commit is contained in:
Jared Tabor
2017-07-26 17:21:59 -07:00
parent d00ccfc442
commit b97fe33152
6 changed files with 23 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
awx/ui/client/src/inventories-hosts/inventories/insights/insights.controller.js
View File

@@ -42,8 +42,8 @@ function (data, $scope, moment, $state, InventoryData, InsightsService) {
window.open(`https://access.redhat.com/insights/inventory?machine=${$scope.$parent.host.insights_system_id}`, '_blank'); window.open(`https://access.redhat.com/insights/inventory?machine=${$scope.$parent.host.insights_system_id}`, '_blank');
}; };
$scope.remediateInventory = function(inv_id, inv_name, insights_credential){ $scope.remediateInventory = function(inv_id, insights_credential){
$state.go('templates.addJobTemplate', {inventory_id: inv_id, inventory_name:inv_name, credential_id: insights_credential}); $state.go('templates.addJobTemplate', {inventory_id: inv_id, credential_id: insights_credential});
}; };
$scope.formCancel = function(){ $scope.formCancel = function(){

2
awx/ui/client/src/inventories-hosts/inventories/insights/insights.partial.html
View File

@@ -88,6 +88,6 @@
<div class="buttons Form-buttons"> <div class="buttons Form-buttons">
<button type="button" class="btn btn-sm Form-primaryButton" ng-click="viewDataInInsights()"> <i class="fa fa-sign-out"></i> VIEW DATA IN INSIGHTS</button> <button type="button" class="btn btn-sm Form-primaryButton" ng-click="viewDataInInsights()"> <i class="fa fa-sign-out"></i> VIEW DATA IN INSIGHTS</button>
<button type="button" class="btn btn-sm Form-primaryButton" ng-click="remediateInventory(inventory.id, inventory.name, insights_credential)" ng-hide="reports.length === 0 || !insights_credential"> REMEDIATE INVENTORY</button> <button type="button" class="btn btn-sm Form-primaryButton" ng-click="remediateInventory(inventory.id, insights_credential)" ng-hide="reports.length === 0 || !insights_credential"> REMEDIATE INVENTORY</button>
<button type="button" class="btn btn-sm Form-cancelButton Insights-cancelButton" ng-click="formCancel()"> Close</button> <button type="button" class="btn btn-sm Form-cancelButton Insights-cancelButton" ng-click="formCancel()"> Close</button>
</div> </div>

4
awx/ui/client/src/inventories-hosts/inventories/standard-inventory/edit/inventory-edit.controller.js
View File

@@ -105,8 +105,8 @@ function InventoriesEdit($scope, $location,
$state.go('inventories'); $state.go('inventories');
}; };
$scope.remediateInventory = function(inv_id, inv_name, insights_credential){ $scope.remediateInventory = function(inv_id, insights_credential){
$state.go('templates.addJobTemplate', {inventory_id: inv_id, inventory_name:inv_name, credential_id: insights_credential}); $state.go('templates.addJobTemplate', {inventory_id: inv_id, credential_id: insights_credential});
}; };
} }

2
awx/ui/client/src/inventories-hosts/inventories/standard-inventory/inventory.form.js
View File

@@ -200,7 +200,7 @@ function(i18n, InventoryCompletedJobsList) {
}, },
relatedButtons: { relatedButtons: {
remediate_inventory: { remediate_inventory: {
ngClick: 'remediateInventory(id, name, insights_credential)', ngClick: 'remediateInventory(id, insights_credential)',
ngShow: 'is_insights && mode !== "add"', ngShow: 'is_insights && mode !== "add"',
label: i18n._('Remediate Inventory'), label: i18n._('Remediate Inventory'),
class: 'Form-primaryButton' class: 'Form-primaryButton'

4
awx/ui/client/src/templates/job_templates/add-job-template/job-template-add.controller.js
View File

@@ -197,8 +197,8 @@
}; };
if(Inventory){ if(Inventory){
$scope.inventory = Inventory.inventory_id; $scope.inventory = Inventory.id;
$scope.inventory_name = Inventory.inventory_name; $scope.inventory_name = Inventory.name;
} }
if(Project){ if(Project){
$scope.project = Project.id; $scope.project = Project.id;

22
awx/ui/client/src/templates/main.js
View File

@@ -44,7 +44,7 @@ angular.module('templates', [surveyMaker.name, templatesList.name, jobTemplates.
addJobTemplate = stateDefinitions.generateTree({ addJobTemplate = stateDefinitions.generateTree({
name: 'templates.addJobTemplate', name: 'templates.addJobTemplate',
url: '/add_job_template?inventory_id&inventory_name&credential_id', url: '/add_job_template?inventory_id&credential_id',
modes: ['add'], modes: ['add'],
form: 'JobTemplateForm', form: 'JobTemplateForm',
controllers: { controllers: {
@@ -52,13 +52,21 @@ angular.module('templates', [surveyMaker.name, templatesList.name, jobTemplates.
}, },
resolve: { resolve: {
add: { add: {
Inventory: ['$stateParams', Inventory: ['$stateParams', 'Rest', 'GetBasePath', 'ProcessErrors',
function($stateParams){ function($stateParams, Rest, GetBasePath, ProcessErrors){
if($stateParams.inventory_id){ if($stateParams.inventory_id){
let obj = {}; let path = `${GetBasePath('inventory')}${$stateParams.inventory_id}`;
obj.inventory_id = Number($stateParams.inventory_id); Rest.setUrl(path);
obj.inventory_name = $stateParams.inventory_name; return Rest.get().
return obj; then(function(data){
return data.data;
}).catch(function(response) {
ProcessErrors(null, response.data, response.status, null, {
hdr: 'Error!',
msg: 'Failed to get inventory info. GET returned status: ' +
response.status
});
});
} }
}], }],
Project: ['$stateParams', 'Rest', 'GetBasePath', 'ProcessErrors', Project: ['$stateParams', 'Rest', 'GetBasePath', 'ProcessErrors',