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

Update dataset from event listener instead of queryset search method

Browse Source
This commit is contained in:
Marliana Lara
2019-03-11 14:55:09 -04:00
parent b55212368b
commit ee6445d620
3 changed files with 4 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
awx/ui/client/features/applications/list-applications.controller.js
View File

@@ -8,10 +8,8 @@ function ListApplicationsController (
$scope, $scope,
$state, $state,
Dataset, Dataset,
GetBasePath,
ProcessErrors, ProcessErrors,
Prompt, Prompt,
qs,
resolvedModels, resolvedModels,
strings, strings,
Wait Wait
@@ -160,10 +158,8 @@ ListApplicationsController.$inject = [
'$scope', '$scope',
'$state', '$state',
'Dataset', 'Dataset',
'GetBasePath',
'ProcessErrors', 'ProcessErrors',
'Prompt', 'Prompt',
'QuerySet',
'resolvedModels', 'resolvedModels',
'ApplicationsStrings', 'ApplicationsStrings',
'Wait' 'Wait'

8
awx/ui/client/features/jobs/jobsList.controller.js
View File

@@ -74,6 +74,8 @@ function ListJobsController (
// are represented in the url. // are represented in the url.
$scope.$on('updateDataset', (event, dataset, queryset) => { $scope.$on('updateDataset', (event, dataset, queryset) => {
paginateQuerySet = queryset; paginateQuerySet = queryset;
vm.jobs = dataset.results;
vm.job_dataset = dataset;
}); });
vm.onToolbarSort = (sort) => { vm.onToolbarSort = (sort) => {
@@ -90,12 +92,6 @@ function ListJobsController (
$state.go('.', { $state.go('.', {
job_search: queryParams job_search: queryParams
}, { notify: false, location: 'replace' }); }, { notify: false, location: 'replace' });
qs.search(SearchBasePath, queryParams)
.then(({ data }) => {
vm.jobs = data.results;
vm.job_dataset = data;
});
}; };
$scope.$watch('vm.job_dataset.count', () => { $scope.$watch('vm.job_dataset.count', () => {

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

@@ -80,6 +80,8 @@ function projectsListController (
// Remove this event listener once the page and page_size params // Remove this event listener once the page and page_size params
// are represented in the url. // are represented in the url.
$scope.$on('updateDataset', (event, dataset, queryset) => { $scope.$on('updateDataset', (event, dataset, queryset) => {
vm.dataset = dataset;
vm.projects = dataset.results;
paginateQuerySet = queryset; paginateQuerySet = queryset;
}); });
@@ -97,12 +99,6 @@ function projectsListController (
$state.go('.', { $state.go('.', {
project_search: queryParams project_search: queryParams
}, { notify: false, location: 'replace' }); }, { notify: false, location: 'replace' });
qs.search(GetBasePath(vm.list.basePath), queryParams)
.then(({ data }) => {
vm.dataset = data;
vm.projects = vm.dataset.results;
});
}; };
$scope.$on('ws-jobs', (e, data) => { $scope.$on('ws-jobs', (e, data) => {