From f8a9402d4b3d2bd36b5486ea5af15a369395d5ed Mon Sep 17 00:00:00 2001 From: mabashian Date: Mon, 30 Apr 2018 11:55:54 -0400 Subject: [PATCH] Fixed team list org sorting --- awx/ui/client/src/teams/list/teams-list.controller.js | 3 --- awx/ui/client/src/teams/teams.list.js | 2 +- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/awx/ui/client/src/teams/list/teams-list.controller.js b/awx/ui/client/src/teams/list/teams-list.controller.js index 254629d30b..024f74361b 100644 --- a/awx/ui/client/src/teams/list/teams-list.controller.js +++ b/awx/ui/client/src/teams/list/teams-list.controller.js @@ -28,9 +28,6 @@ export default ['$scope', 'Rest', 'TeamList', 'Prompt', $scope.list = list; $scope[`${list.iterator}_dataset`] = Dataset.data; $scope[list.name] = $scope[`${list.iterator}_dataset`].results; - _.forEach($scope[list.name], (team) => { - team.organization_name = team.summary_fields.organization.name; - }); $scope.selected = []; } diff --git a/awx/ui/client/src/teams/teams.list.js b/awx/ui/client/src/teams/teams.list.js index 1af52a8084..e1d9c5af35 100644 --- a/awx/ui/client/src/teams/teams.list.js +++ b/awx/ui/client/src/teams/teams.list.js @@ -28,7 +28,7 @@ export default ['i18n', function(i18n) { }, organization: { label: i18n._('Organization'), - ngBind: 'team.organization_name', + ngBind: 'team.summary_fields.organization.name', sourceModel: 'organization', sourceField: 'name', columnClass: 'col-md-3 hidden-sm hidden-xs',