Merge branch 'master' into expunge-zeromq-unstable

awx/ui/static/js/controllers/JobTemplates.js

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

awx/ui/static/js/forms/Permissions.js

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

awx/ui/static/js/helpers/JobSubmission.js

@@ -22,7 +22,8 @@ angular.module('JobSubmissionHelper', [ 'RestServices', 'Utilities', 'Credential
                 callback = params.callback || 'JobLaunched',
                 job_launch_data = {},
                 url = params.url,
-                fld;
+                fld,
+                extra_vars;
 
 
             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){
-                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){
                 for (fld in scope.job_launch_form){

awx/ui/static/js/lists/JobTemplates.js

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