From 1c2535f0505a725e8f11312144ce4933e69c43f6 Mon Sep 17 00:00:00 2001
From: Michael Abashian <mabashian@ansible.com>
Date: Tue, 14 Mar 2017 16:11:11 -0400
Subject: [PATCH] Users can interact with organization field when adding

---
 awx/ui/client/src/controllers/Credentials.js                    | 1 +
 awx/ui/client/src/controllers/Projects.js                       | 1 +
 awx/ui/client/src/controllers/Teams.js                          | 1 +
 awx/ui/client/src/forms/Workflows.js                            | 2 +-
 awx/ui/client/src/inventories/add/inventory-add.controller.js   | 1 +
 .../templates/workflows/add-workflow/workflow-add.controller.js | 1 +
 6 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/awx/ui/client/src/controllers/Credentials.js b/awx/ui/client/src/controllers/Credentials.js
index 5f7f6e9a25..83f19d2bc1 100644
--- a/awx/ui/client/src/controllers/Credentials.js
+++ b/awx/ui/client/src/controllers/Credentials.js
@@ -126,6 +126,7 @@ export function CredentialsAdd($scope, $rootScope, $compile, $location, $log,
     init();
 
     function init() {
+        $scope.canEditOrg = true;
         // Load the list of options for Kind
         GetChoices({
             scope: $scope,
diff --git a/awx/ui/client/src/controllers/Projects.js b/awx/ui/client/src/controllers/Projects.js
index 759f23be60..7c1b98d17d 100644
--- a/awx/ui/client/src/controllers/Projects.js
+++ b/awx/ui/client/src/controllers/Projects.js
@@ -314,6 +314,7 @@ export function ProjectsAdd($scope, $rootScope, $compile, $location, $log,
     init();
 
     function init() {
+        $scope.canEditOrg = true;
         Rest.setUrl(GetBasePath('projects'));
         Rest.options()
             .success(function(data) {
diff --git a/awx/ui/client/src/controllers/Teams.js b/awx/ui/client/src/controllers/Teams.js
index 1db3843bef..f6f3dc44db 100644
--- a/awx/ui/client/src/controllers/Teams.js
+++ b/awx/ui/client/src/controllers/Teams.js
@@ -110,6 +110,7 @@ export function TeamsAdd($scope, $rootScope, $stateParams, TeamForm, GenerateFor
     init();
 
     function init() {
+        $scope.canEditOrg = true;
         // apply form definition's default field values
         GenerateForm.applyDefaults(form, $scope);
 
diff --git a/awx/ui/client/src/forms/Workflows.js b/awx/ui/client/src/forms/Workflows.js
index f0e7c24dc6..821a3ab072 100644
--- a/awx/ui/client/src/forms/Workflows.js
+++ b/awx/ui/client/src/forms/Workflows.js
@@ -55,7 +55,7 @@ export default
                     dataPlacement: 'right',
                     column: 1,
                     ngDisabled: '!(workflow_job_template_obj.summary_fields.user_capabilities.edit || canAddWorkflowJobTemplate) || !canEditOrg',
-                    awLookupWhen: '(workflow_job_template_obj.summary_fields.user_capabilities.edit || canAdd) && canEditOrg'
+                    awLookupWhen: '(workflow_job_template_obj.summary_fields.user_capabilities.edit || canAddWorkflowJobTemplate) && canEditOrg'
                 },
                 labels: {
                     label: i18n._('Labels'),
diff --git a/awx/ui/client/src/inventories/add/inventory-add.controller.js b/awx/ui/client/src/inventories/add/inventory-add.controller.js
index a20fb44891..a6effbbb81 100644
--- a/awx/ui/client/src/inventories/add/inventory-add.controller.js
+++ b/awx/ui/client/src/inventories/add/inventory-add.controller.js
@@ -39,6 +39,7 @@ function InventoriesAdd($scope, $rootScope, $compile, $location, $log,
     init();
 
     function init() {
+        $scope.canEditOrg = true;
         form.formLabelSize = null;
         form.formFieldSize = null;
 
diff --git a/awx/ui/client/src/templates/workflows/add-workflow/workflow-add.controller.js b/awx/ui/client/src/templates/workflows/add-workflow/workflow-add.controller.js
index 11c7e35a5c..036ff6b21f 100644
--- a/awx/ui/client/src/templates/workflows/add-workflow/workflow-add.controller.js
+++ b/awx/ui/client/src/templates/workflows/add-workflow/workflow-add.controller.js
@@ -29,6 +29,7 @@
              generator = GenerateForm;
 
          function init() {
+             $scope.canEditOrg = true;
              $scope.parseType = 'yaml';
              $scope.can_edit = true;
              // apply form definition's default field values