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

Fixed team list org sorting

Browse Source
This commit is contained in:
mabashian
2018-04-30 11:55:54 -04:00
parent 7781667977
commit f8a9402d4b
2 changed files with 1 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
awx/ui/client/src/teams/list/teams-list.controller.js
View File

@@ -28,9 +28,6 @@ export default ['$scope', 'Rest', 'TeamList', 'Prompt',
$scope.list = list; $scope.list = list;
$scope[`${list.iterator}_dataset`] = Dataset.data; $scope[`${list.iterator}_dataset`] = Dataset.data;
$scope[list.name] = $scope[`${list.iterator}_dataset`].results; $scope[list.name] = $scope[`${list.iterator}_dataset`].results;
_.forEach($scope[list.name], (team) => {
team.organization_name = team.summary_fields.organization.name;
});
$scope.selected = []; $scope.selected = [];
} }

2
awx/ui/client/src/teams/teams.list.js
View File

@@ -28,7 +28,7 @@ export default ['i18n', function(i18n) {
}, },
organization: { organization: {
label: i18n._('Organization'), label: i18n._('Organization'),
ngBind: 'team.organization_name', ngBind: 'team.summary_fields.organization.name',
sourceModel: 'organization', sourceModel: 'organization',
sourceField: 'name', sourceField: 'name',
columnClass: 'col-md-3 hidden-sm hidden-xs', columnClass: 'col-md-3 hidden-sm hidden-xs',