shaba/awx
1
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2024-11-01 16:51:11 +03:00
Code Releases Activity

Merge pull request #1625 from mabashian/1621-team-org-list

Browse Source 
Fixed team list org sorting
This commit is contained in:
Michael Abashian 2018-05-02 14:02:00 -04:00 committed by GitHub
commit 48b0d4445c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 1 additions and 4 deletions
Show Stats 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.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 = [];
}

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

@ -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',