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

Merge branch 'master' into expunge-zeromq-unstable

Browse Source
This commit is contained in:
Luke Sneeringer
2014-11-03 10:38:06 -06:00
parent 5e4e61dcda df8a7be759
commit e2b9509ef1
4 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -61,6 +61,8 @@ function JobTemplatesList($scope, $rootScope, $location, $log, $routeParams, Res
LoadBreadCrumbs(); LoadBreadCrumbs();
$scope.showActivity = function () { $scope.showActivity = function () {
Stream({ scope: $scope }); Stream({ scope: $scope });
}; };

8
awx/ui/static/js/forms/Permissions.js
View File

@@ -107,10 +107,10 @@ angular.module('PermissionFormDefinition', [])
value: 'admin', value: 'admin',
ngShow: "category == 'Inventory'" ngShow: "category == 'Inventory'"
}, { }, {
label: 'Create', label: 'Create',
value: 'create', value: 'create',
ngShow: "category == 'Deploy'" ngShow: "category == 'Deploy'"
}, { }, {
label: 'Run', label: 'Run',
value: 'run', value: 'run',
ngShow: "category == 'Deploy'" ngShow: "category == 'Deploy'"

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

@@ -22,7 +22,8 @@ angular.module('JobSubmissionHelper', [ 'RestServices', 'Utilities', 'Credential
callback = params.callback || 'JobLaunched', callback = params.callback || 'JobLaunched',
job_launch_data = {}, job_launch_data = {},
url = params.url, url = params.url,
fld; fld,
extra_vars;
if(!Empty(scope.passwords_needed_to_start) && scope.passwords_needed_to_start .length>0){ if(!Empty(scope.passwords_needed_to_start) && scope.passwords_needed_to_start .length>0){
@@ -31,7 +32,10 @@ angular.module('JobSubmissionHelper', [ 'RestServices', 'Utilities', 'Credential
}); });
} }
if(scope.prompt_for_vars===true){ if(scope.prompt_for_vars===true){
job_launch_data.extra_vars = ToJSON(scope.parseType, scope.variables, true); extra_vars = ToJSON(scope.parseType, scope.variables, false);
$.each(extra_vars, function(key,value){
job_launch_data[key] = value;
});
} }
if(scope.survey_enabled===true){ if(scope.survey_enabled===true){
for (fld in scope.job_launch_form){ for (fld in scope.job_launch_form){

1
awx/ui/static/js/lists/JobTemplates.js
View File

@@ -85,6 +85,7 @@ angular.module('JobTemplatesListDefinition', [])
"class": 'btn-danger btn-xs', "class": 'btn-danger btn-xs',
awToolTip: 'Copy template', awToolTip: 'Copy template',
dataPlacement: 'top', dataPlacement: 'top',
ngHide: 'job_template.summary_fields.can_copy===false'
} }
} }