External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-01-11 18:09:57 -03:30
Code Issues Packages Projects Releases Wiki Activity

Set sort dropdown to state param order_by value

Browse Source
This commit is contained in:
Marliana Lara 2019-03-04 14:40:15 -05:00
parent 8100fc1cfb
commit 80adcaab81
No known key found for this signature in database
GPG Key ID: 38C73B40DFA809EE
3 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
awx/ui/client/features/projects/projectsList.controller.js
View File

@ -27,7 +27,6 @@ function projectsListController (
};
vm.dataset = Dataset.data;
vm.projects = Dataset.data.results;
vm.querySet = $state.params.project_search;
$scope.$watch('vm.dataset.count', () => {
$scope.$emit('updateCount', vm.dataset.count, 'projects');
@ -48,8 +47,19 @@ function projectsListController (
} else {
vm.activeId = '';
}
setToolbarSort();
}, true);
function setToolbarSort () {
const orderByValue = _.get($state.params, 'project_search.order_by');
const sortValue = _.find(vm.toolbarSortOptions, (option) => option.value === orderByValue);
if (sortValue) {
vm.toolbarSortValue = sortValue;
} else {
vm.toolbarSortValue = toolbarSortDefault;
}
}
const toolbarSortDefault = {
label: `${strings.get('sort.NAME_ASCENDING')}`,
value: 'name'
@ -69,7 +79,7 @@ function projectsListController (
vm.toolbarSortValue = sort;
const queryParams = Object.assign(
vm.querySet,
$state.params.project_search,
{ order_by: sort.value }
);

3
awx/ui/client/features/projects/projectsList.view.html
View File

@ -101,7 +101,6 @@
collection="vm.projects"
dataset="vm.dataset"
iterator="project"
base-path="projects"
query-set="vm.querySet">
base-path="projects">
</paginate>
</at-panel-body>

2
awx/ui/client/lib/components/list/list-toolbar.partial.html
View File

@ -1,7 +1,7 @@
<div class="at-List-toolbar--attached">
<div ng-class="isCollapsed ? 'active' : ''" ng-if="!sortOnly" class="at-List-toolbar-item" ng-click="onCollapse()">{{ vm.strings.get('toolbar.COMPACT') }}</div>
<div ng-class="!isCollapsed ? 'active' : ''" ng-if="!sortOnly" class="at-List-toolbar-item" ng-click="onExpand()">{{ vm.strings.get('toolbar.EXPANDED') }}</div>
<div class="at-List-toolbarDropdown dropdown">
<div ng-if="sortOptions" class="at-List-toolbarDropdown dropdown">
<button
class="at-List-toolbarDropdown-toggle dropdown-toggle"
data-display="static"