From 4fa06bacd83dccd31d60fe62404f16ef00717597 Mon Sep 17 00:00:00 2001
From: John Mitchell <jlmitch5@ncsu.edu>
Date: Tue, 17 Nov 2015 11:11:08 -0500
Subject: [PATCH] fixed organization rest call from happening

---
 awx/ui/client/src/controllers/Teams.js | 31 ++------------------------
 1 file changed, 2 insertions(+), 29 deletions(-)

diff --git a/awx/ui/client/src/controllers/Teams.js b/awx/ui/client/src/controllers/Teams.js
index 1cc8408bd1..4d684c0c21 100644
--- a/awx/ui/client/src/controllers/Teams.js
+++ b/awx/ui/client/src/controllers/Teams.js
@@ -227,34 +227,6 @@ export function TeamsEdit($scope, $rootScope, $compile, $location, $log, $routeP
 
     $scope.PermissionAddAllowed = false;
 
-    // Retrieve each related set and any lookups
-    if ($scope.teamLoadedRemove) {
-        $scope.teamLoadedRemove();
-    }
-    $scope.teamLoadedRemove = $scope.$on('teamLoaded', function () {
-        CheckAccess({ scope: $scope });
-        if ($scope.organization_url) {
-            Rest.setUrl($scope.organization_url);
-            Rest.get()
-                .success(function (data) {
-                    $scope.organization_name = data.name;
-                    master.organization_name = data.name;
-                    Wait('stop');
-                })
-                .error(function (data, status) {
-                    ProcessErrors($scope, data, status, null, { hdr: 'Error!', msg: 'Failed to retrieve organization: ' +
-                        $scope.orgnization_url + '. GET status: ' + status });
-                });
-            for (var set in relatedSets) {
-                $scope.search(relatedSets[set].iterator);
-            }
-        } else {
-            $scope.organization_name = "";
-            master.organization_name = "";
-            Wait('stop');
-        }
-    });
-
     // Retrieve each related set and any lookups
     if ($scope.loadTeamRemove) {
         $scope.loadTeamRemove();
@@ -307,7 +279,8 @@ export function TeamsEdit($scope, $rootScope, $compile, $location, $log, $routeP
                 });
 
                 $scope.organization_url = data.related.organization;
-                $scope.$emit('teamLoaded');
+                $scope.organization_name = data.summary_fields.organization.name;
+                master.organization_name = data.summary_fields.organization.name;
             })
             .error(function (data, status) {
                 ProcessErrors($scope, data, status, form, { hdr: 'Error!', msg: 'Failed to retrieve team: ' + $routeParams.team_id +