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

Latest job_detail changes as of 5-16. Plus, AC-1279 Rename vars_prompt_on_launch to ask_variables_on_launch.

Browse Source
This commit is contained in:
chouseknecht
2014-05-19 10:50:15 -04:00
parent 6be2e07cbc
commit ec2545d069
6 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
awx/ui/static/js/controllers/JobDetail.js
View File

@@ -653,6 +653,11 @@ function JobDetailController ($scope, $compile, $routeParams, ClearScope, Breadc
SelectPlay({ scope: scope, id: scope.activePlay }); SelectPlay({ scope: scope, id: scope.activePlay });
}, 2000); }, 2000);
}; };
scope.viewEvent = function(event_id) {
}
} }
JobDetailController.$inject = [ '$scope', '$compile', '$routeParams', 'ClearScope', 'Breadcrumbs', 'LoadBreadCrumbs', 'GetBasePath', 'Wait', JobDetailController.$inject = [ '$scope', '$compile', '$routeParams', 'ClearScope', 'Breadcrumbs', 'LoadBreadCrumbs', 'GetBasePath', 'Wait',

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

@@ -615,6 +615,9 @@ function JobTemplatesEdit($scope, $rootScope, $compile, $location, $log, $routeP
$scope.url = data.url; $scope.url = data.url;
$scope.ask_variables_on_launch = (data.ask_variables_on_launch) ? 'true' : 'false';
master.ask_variables_on_launch = $scope.ask_variables_on_launch;
relatedSets = form.relatedSets(data.related); relatedSets = form.relatedSets(data.related);
if (data.host_config_key) { if (data.host_config_key) {

2
awx/ui/static/js/forms/JobTemplates.js
View File

@@ -217,7 +217,7 @@ angular.module('JobTemplateFormDefinition', ['SchedulesListDefinition', 'Complet
dataPlacement: 'right', dataPlacement: 'right',
dataContainer: "body" dataContainer: "body"
}, },
vars_prompt_on_launch: { ask_variables_on_launch: {
label: 'Prompt for Extra Variables', label: 'Prompt for Extra Variables',
type: 'checkbox', type: 'checkbox',
addRequired: false, addRequired: false,

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

@@ -400,12 +400,12 @@ function($location, Wait, GetBasePath, LookUpInit, JobTemplateForm, CredentialLi
Rest.post(job_template).success(function (data) { Rest.post(job_template).success(function (data) {
new_job_id = data.id; new_job_id = data.id;
launch_url = data.related.start; launch_url = data.related.start;
prompt_for_vars = data.vars_prompt_on_launch; prompt_for_vars = data.ask_variables_on_launch;
new_job = data; new_job = data;
if (data.passwords_needed_to_start.length > 0) { if (data.passwords_needed_to_start.length > 0) {
scope.$emit('PromptForPasswords', data.passwords_needed_to_start); scope.$emit('PromptForPasswords', data.passwords_needed_to_start);
} }
else if (data.vars_prompt_on_launch) { else if (data.ask_variables_on_launch) {
scope.$emit('PromptForVars'); scope.$emit('PromptForVars');
} }
else { else {

3
awx/ui/static/less/ansible-ui.less
View File

@@ -1379,7 +1379,8 @@ input[type="checkbox"].checkbox-no-label {
text-overflow: clip;*/ text-overflow: clip;*/
} }
#group-delete-dialog .help-container { #group-delete-dialog .help-container,
#password-modal .help-container {
.help-link, .help-link,
.help-link:active, .help-link:active,
.help-link:visited { .help-link:visited {

2
awx/ui/static/partials/job_detail.html
View File

@@ -114,7 +114,7 @@
<div id="hosts-table-detail-inner"> <div id="hosts-table-detail-inner">
<div class="row" ng-repeat="result in results = (hostResults | filter:{ status : searchAllStatus} | filter:{ task_id: activeTask })"> <div class="row" ng-repeat="result in results = (hostResults | filter:{ status : searchAllStatus} | filter:{ task_id: activeTask })">
<div class="col-lg-7 col-md-7 col-sm-7 col-xs-7 status-column"> <div class="col-lg-7 col-md-7 col-sm-7 col-xs-7 status-column">
<a href="" ng-click="doSomething()" aw-tool-tip="Event Id: {{ result.id }} Status: {{ result.status }}. Click for details" data-placement="top"><i class="fa icon-job-{{ result.status }}"></i> {{ result.name }}</a> <a href="" ng-click="viewEvent(result.id)" aw-tool-tip="Event Id: {{ result.id }} Status: {{ result.status }}. Click for details" data-placement="top"><i class="fa icon-job-{{ result.status }}"></i> {{ result.name }}</a>
</div> </div>
<div class="col-lg-5 col-md-5 col-sm-5 col-xs-5"> <div class="col-lg-5 col-md-5 col-sm-5 col-xs-5">
{{ result.msg }} {{ result.msg }}