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

fixed scan job and job run type ordering

Browse Source
This commit is contained in:
John Mitchell
2015-05-11 13:15:24 -04:00
parent ac76423a93
commit 23a69995d3
1 changed files with 19 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
awx/ui/static/js/controllers/JobTemplates.js
View File

@@ -346,6 +346,25 @@ export function JobTemplatesAdd($scope, $rootScope, $compile, $location, $log, $
// this sets the default options for the selects as specified by the controller. // this sets the default options for the selects as specified by the controller.
$scope.verbosity = $scope.verbosity_options[$scope.verbosity_field.default]; $scope.verbosity = $scope.verbosity_options[$scope.verbosity_field.default];
$scope.job_type = $scope.job_type_options[$scope.job_type_field.default]; $scope.job_type = $scope.job_type_options[$scope.job_type_field.default];
// if you're getting to the form from the scan job section on inventories,
// set the job type select to be scan
if ($routeParams.inventory_id) {
// This means that the job template form was accessed via inventory prop's
// This also means the job is a scan job.
$scope.job_type.value = 'scan';
$scope.jobTypeChange();
$scope.inventory = $routeParams.inventory_id;
Rest.setUrl(GetBasePath('inventory') + $routeParams.inventory_id + '/');
Rest.get()
.success(function (data) {
$scope.inventory_name = data.name;
})
.error(function (data, status) {
ProcessErrors($scope, data, status, form, { hdr: 'Error!',
msg: 'Failed to lookup inventory: ' + data.id + '. GET returned status: ' + status });
});
}
$scope.$emit('lookUpInitialize'); $scope.$emit('lookUpInitialize');
} }
}); });
@@ -424,23 +443,6 @@ export function JobTemplatesAdd($scope, $rootScope, $compile, $location, $log, $
} }
}; };
if ($routeParams.inventory_id) {
// This means that the job template form was accessed via inventory prop's
// This also means the job is a scan job.
$scope.job_type.value = 'scan';
$scope.jobTypeChange();
$scope.inventory = $routeParams.inventory_id;
Rest.setUrl(GetBasePath('inventory') + $routeParams.inventory_id + '/');
Rest.get()
.success(function (data) {
$scope.inventory_name = data.name;
})
.error(function (data, status) {
ProcessErrors($scope, data, status, form, { hdr: 'Error!',
msg: 'Failed to lookup inventory: ' + data.id + '. GET returned status: ' + status });
});
}
// Detect and alert user to potential SCM status issues // Detect and alert user to potential SCM status issues
checkSCMStatus = function (oldValue, newValue) { checkSCMStatus = function (oldValue, newValue) {
if (oldValue !== newValue && !Empty($scope.project)) { if (oldValue !== newValue && !Empty($scope.project)) {