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

adding launch button for scan jobs

Browse Source 
on inventory properties page. I also adjusted the indentation on the job submission page so that it was completly crazy.
This commit is contained in:
Jared Tabor
2015-03-19 11:50:44 -04:00
parent 8b710c191b
commit 2883a70cba
3 changed files with 1061 additions and 1051 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
awx/ui/static/js/controllers/Inventories.js
View File

@@ -482,7 +482,7 @@ InventoriesAdd.$inject = ['$scope', '$rootScope', '$compile', '$location', '$log
export function InventoriesEdit($scope, $rootScope, $compile, $location, $log, $routeParams, InventoryForm, GenerateForm, Rest, export function InventoriesEdit($scope, $rootScope, $compile, $location, $log, $routeParams, InventoryForm, GenerateForm, Rest,
Alert, ProcessErrors, LoadBreadCrumbs, ReturnToCaller, ClearScope, generateList, OrganizationList, SearchInit, PaginateInit, Alert, ProcessErrors, LoadBreadCrumbs, ReturnToCaller, ClearScope, generateList, OrganizationList, SearchInit, PaginateInit,
LookUpInit, GetBasePath, ParseTypeChange, Wait, ToJSON, ParseVariableString, Stream, RelatedSearchInit, RelatedPaginateInit, Prompt) { LookUpInit, GetBasePath, ParseTypeChange, Wait, ToJSON, ParseVariableString, Stream, RelatedSearchInit, RelatedPaginateInit, Prompt, PlaybookRun) {
ClearScope(); ClearScope();
@@ -660,6 +660,10 @@ export function InventoriesEdit($scope, $rootScope, $compile, $location, $log, $
$location.path($location.path()+'/job_templates/add'); $location.path($location.path()+'/job_templates/add');
}; };
$scope.launchScanJob = function(){
PlaybookRun({ scope: $scope, id: this.scan_job_template.id });
};
$scope.editScanJob = function(){ $scope.editScanJob = function(){
$location.path($location.path()+'/job_templates/'+this.scan_job_template.id); $location.path($location.path()+'/job_templates/'+this.scan_job_template.id);
}; };
@@ -694,7 +698,7 @@ export function InventoriesEdit($scope, $rootScope, $compile, $location, $log, $
InventoriesEdit.$inject = ['$scope', '$rootScope', '$compile', '$location', '$log', '$routeParams', 'InventoryForm', 'GenerateForm', InventoriesEdit.$inject = ['$scope', '$rootScope', '$compile', '$location', '$log', '$routeParams', 'InventoryForm', 'GenerateForm',
'Rest', 'Alert', 'ProcessErrors', 'LoadBreadCrumbs', 'ReturnToCaller', 'ClearScope', 'generateList', 'OrganizationList', 'SearchInit', 'Rest', 'Alert', 'ProcessErrors', 'LoadBreadCrumbs', 'ReturnToCaller', 'ClearScope', 'generateList', 'OrganizationList', 'SearchInit',
'PaginateInit', 'LookUpInit', 'GetBasePath', 'ParseTypeChange', 'Wait', 'ToJSON', 'ParseVariableString', 'Stream', 'RelatedSearchInit', 'RelatedPaginateInit', 'Prompt' 'PaginateInit', 'LookUpInit', 'GetBasePath', 'ParseTypeChange', 'Wait', 'ToJSON', 'ParseVariableString', 'Stream', 'RelatedSearchInit', 'RelatedPaginateInit', 'Prompt', 'PlaybookRun'
]; ];

6
awx/ui/static/js/forms/Inventories.js
View File

@@ -125,6 +125,12 @@ export default
}, },
fieldActions: { fieldActions: {
submit: {
label: 'Launch',
ngClick: "launchScanJob()",
awToolTip: 'Launch the scan job template',
'class': 'btn btn-default'
},
edit: { edit: {
label: 'Edit', label: 'Edit',
ngClick: "editScanJob()", ngClick: "editScanJob()",

34
awx/ui/static/js/helpers/JobSubmission.js
View File

@@ -1,9 +1,9 @@
/********************************************* /*********************************************
* Copyright (c) 2014 AnsibleWorks, Inc. * Copyright (c) 2014 AnsibleWorks, Inc.
* *
* JobSubmission.js * JobSubmission.js
* *
*/ */
/** /**
* @ngdoc function * @ngdoc function
* @name helpers.function:JobSubmission * @name helpers.function:JobSubmission
@@ -13,10 +13,10 @@
export default export default
angular.module('JobSubmissionHelper', [ 'RestServices', 'Utilities', 'CredentialFormDefinition', 'CredentialsListDefinition', angular.module('JobSubmissionHelper', [ 'RestServices', 'Utilities', 'CredentialFormDefinition', 'CredentialsListDefinition',
'LookUpHelper', 'JobSubmissionHelper', 'JobTemplateFormDefinition', 'ModalDialog', 'FormGenerator', 'JobVarsPromptFormDefinition']) 'LookUpHelper', 'JobSubmissionHelper', 'JobTemplateFormDefinition', 'ModalDialog', 'FormGenerator', 'JobVarsPromptFormDefinition'])
.factory('LaunchJob', ['Rest', 'Wait', 'ProcessErrors', 'ToJSON', 'Empty', 'GetBasePath', .factory('LaunchJob', ['Rest', 'Wait', 'ProcessErrors', 'ToJSON', 'Empty', 'GetBasePath',
function(Rest, Wait, ProcessErrors, ToJSON, Empty, GetBasePath) { function(Rest, Wait, ProcessErrors, ToJSON, Empty, GetBasePath) {
return function(params) { return function(params) {
var scope = params.scope, var scope = params.scope,
callback = params.callback || 'JobLaunched', callback = params.callback || 'JobLaunched',
@@ -124,10 +124,10 @@ angular.module('JobSubmissionHelper', [ 'RestServices', 'Utilities', 'Credential
}; };
}]) }])
.factory('PromptForCredential', ['$location', 'Wait', 'GetBasePath', 'LookUpInit', 'JobTemplateForm', 'CredentialList', 'Rest', 'Prompt', 'ProcessErrors', .factory('PromptForCredential', ['$location', 'Wait', 'GetBasePath', 'LookUpInit', 'JobTemplateForm', 'CredentialList', 'Rest', 'Prompt', 'ProcessErrors',
function($location, Wait, GetBasePath, LookUpInit, JobTemplateForm, CredentialList, Rest, Prompt, ProcessErrors) { function($location, Wait, GetBasePath, LookUpInit, JobTemplateForm, CredentialList, Rest, Prompt, ProcessErrors) {
return function(params) { return function(params) {
var scope = params.scope, var scope = params.scope,
@@ -192,13 +192,13 @@ angular.module('JobSubmissionHelper', [ 'RestServices', 'Utilities', 'Credential
msg: 'Checking for machine credentials failed. GET returned: ' + status }); msg: 'Checking for machine credentials failed. GET returned: ' + status });
}); });
}; };
}]) }])
.factory('CreateLaunchDialog', ['$compile', 'Rest', 'GetBasePath', 'TextareaResize', 'CreateDialog', 'GenerateForm', .factory('CreateLaunchDialog', ['$compile', 'Rest', 'GetBasePath', 'TextareaResize', 'CreateDialog', 'GenerateForm',
'JobVarsPromptForm', 'Wait', 'ParseTypeChange', 'JobVarsPromptForm', 'Wait', 'ParseTypeChange',
function($compile, Rest, GetBasePath, TextareaResize,CreateDialog, GenerateForm, function($compile, Rest, GetBasePath, TextareaResize,CreateDialog, GenerateForm,
JobVarsPromptForm, Wait, ParseTypeChange) { JobVarsPromptForm, Wait, ParseTypeChange) {
return function(params) { return function(params) {
var buttons, var buttons,
@@ -676,7 +676,7 @@ angular.module('JobSubmissionHelper', [ 'RestServices', 'Utilities', 'Credential
/** /**
* @ngdoc method * @ngdoc method
* @name helpers.function:JobSubmission#PlaybookRun * @name helpers.function:JobSubmission#PlaybookRun
* @methodOf helpers.function:JobSubmission * @methodOf helpers.function:JobSubmission
@@ -700,7 +700,7 @@ angular.module('JobSubmissionHelper', [ 'RestServices', 'Utilities', 'Credential
launch_url, launch_url,
html; html;
scope.job_template_id = id; scope.job_template_id = id;
if (base === 'job_templates' || base === 'portal') { if (base === 'job_templates' || base === 'portal' || base === 'inventories') {
url = GetBasePath('job_templates') + id + '/launch/'; url = GetBasePath('job_templates') + id + '/launch/';
} }
else { else {