External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-03-07 19:51:08 -03:30
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #80 from ansible/teams_error

Browse Source 
fix of the teams list console errors
This commit is contained in:
jlmitch5
2015-02-18 16:28:56 -05:00
parent a0ffd50207 9698b79f3f
commit c9d527ee77
1 changed files with 20 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
awx/ui/static/js/controllers/Teams.js
View File

@@ -202,19 +202,25 @@ export function TeamsEdit($scope, $rootScope, $compile, $location, $log, $routeP
} }
$scope.teamLoadedRemove = $scope.$on('teamLoaded', function () { $scope.teamLoadedRemove = $scope.$on('teamLoaded', function () {
CheckAccess({ scope: $scope }); CheckAccess({ scope: $scope });
Rest.setUrl($scope.organization_url); if ($scope.organization_url) {
Rest.get() Rest.setUrl($scope.organization_url);
.success(function (data) { Rest.get()
$scope.organization_name = data.name; .success(function (data) {
master.organization_name = data.name; $scope.organization_name = data.name;
Wait('stop'); master.organization_name = data.name;
}) Wait('stop');
.error(function (data, status) { })
ProcessErrors($scope, data, status, null, { hdr: 'Error!', msg: 'Failed to retrieve organization: ' + .error(function (data, status) {
$scope.orgnization_url + '. GET status: ' + 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); for (var set in relatedSets) {
$scope.search(relatedSets[set].iterator);
}
} else {
$scope.organization_name = "";
master.organization_name = "";
Wait('stop');
} }
}); });