Merge pull request #1255 from mabashian/templates-forms-disabled

Fixed bug where job/workflow templates add forms were disabled

awx/ui/client/src/templates/job_templates/add-job-template/job-template-add.controller.js

@@ -10,14 +10,14 @@
         'ProcessErrors', 'GetBasePath', 'md5Setup', 'ParseTypeChange', 'Wait',
         'Empty', 'ToJSON', 'CallbackHelpInit', 'GetChoices', '$state', 'availableLabels',
         'CreateSelect2', '$q', 'i18n', 'Inventory', 'Project', 'InstanceGroupsService',
-        'MultiCredentialService', 'ConfigData',
+        'MultiCredentialService', 'ConfigData', 'resolvedModels',
          function(
              $filter, $scope,
              $stateParams, JobTemplateForm, GenerateForm, Rest, Alert,
              ProcessErrors, GetBasePath, md5Setup, ParseTypeChange, Wait,
              Empty, ToJSON, CallbackHelpInit, GetChoices,
              $state, availableLabels, CreateSelect2, $q, i18n, Inventory, Project, InstanceGroupsService,
-             MultiCredentialService, ConfigData
+             MultiCredentialService, ConfigData, resolvedModels
          ) {
 
             // Inject dynamic view
@@ -28,8 +28,10 @@
                 selectPlaybook, checkSCMStatus,
                 callback;
 
-            init();
+            const jobTemplate = resolvedModels[0];
-            function init(){
+
+            $scope.canAddJobTemplate = jobTemplate.options('actions.POST');
+
             // apply form definition's default field values
             GenerateForm.applyDefaults(form, $scope);
 
@@ -58,7 +60,6 @@
                     selectedCredentials: []
                 };
             });
-            }
 
             callback = function() {
                 // Make sure the form controller knows there was a change

awx/ui/client/src/templates/workflows/add-workflow/workflow-add.controller.js

@@ -8,15 +8,20 @@ export default [
     '$scope', 'WorkflowForm', 'GenerateForm', 'Alert', 'ProcessErrors',
     'Wait', '$state', 'CreateSelect2', 'TemplatesService',
     'ToJSON', 'ParseTypeChange', '$q', 'Rest', 'GetBasePath', 'availableLabels', 'i18n',
+    'resolvedModels',
     function($scope, WorkflowForm, GenerateForm, Alert, ProcessErrors,
     Wait, $state, CreateSelect2, TemplatesService, ToJSON,
-    ParseTypeChange, $q, Rest, GetBasePath, availableLabels, i18n) {
+    ParseTypeChange, $q, Rest, GetBasePath, availableLabels, i18n,
+    resolvedModels) {
 
          // Inject dynamic view
          let form = WorkflowForm(),
              generator = GenerateForm;
 
-         function init() {
+         const workflowTemplate = resolvedModels[1];
+
+         $scope.canAddWorkflowJobTemplate = workflowTemplate.options('actions.POST');
+
          $scope.canEditOrg = true;
          $scope.parseType = 'yaml';
          $scope.can_edit = true;
@@ -44,7 +49,6 @@ export default [
 
          $scope.workflowEditorTooltip = i18n._("Please save before defining the workflow graph.");
          $scope.surveyTooltip = i18n._('Please save before adding a survey to this workflow.');
-         }
 
          $scope.formSave = function () {
              let fld, data = {};
@@ -167,7 +171,5 @@ export default [
          $scope.formCancel = function () {
              $state.transitionTo('templates');
          };
-
-         init();
      }
     ];

awx/ui/test/spec/workflows/workflow-add.controller-test.js

@@ -16,7 +16,8 @@ describe('Controller: WorkflowAdd', () => {
         Wait,
         ParseTypeChange,
         ToJSON,
-        availableLabels;
+        availableLabels,
+        resolvedModels;
 
     beforeEach(angular.mock.module('awApp'));
     beforeEach(angular.mock.module('RestServices'));
@@ -49,6 +50,15 @@ describe('Controller: WorkflowAdd', () => {
             id: "1"
         }];
 
+        resolvedModels = [
+            {},
+            {
+                options: () => {
+                    return true;
+                }
+            }
+        ];
+
         Alert = jasmine.createSpy('Alert');
         ProcessErrors = jasmine.createSpy('ProcessErrors');
         CreateSelect2 = jasmine.createSpy('CreateSelect2');
@@ -65,6 +75,7 @@ describe('Controller: WorkflowAdd', () => {
         $provide.value('ParseTypeChange', ParseTypeChange);
         $provide.value('ToJSON', ToJSON);
         $provide.value('availableLabels', availableLabels);
+        $provide.value('resolvedModels', resolvedModels);
     }));
 
     beforeEach(angular.mock.inject( ($rootScope, $controller, $q, $httpBackend, _state_, _ConfigService_, _GetChoices_, _Alert_, _GenerateForm_, _ProcessErrors_, _CreateSelect2_, _Wait_, _ParseTypeChange_, _ToJSON_, _availableLabels_) => {