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

Removes vm.querySet from jobs list and ensures that state params are updated when search is performed to prevent context loss on data refresh.

Browse Source
This commit is contained in:
mabashian
2019-03-04 15:03:52 -05:00
parent bf1769af6c
commit ca5f27aa9e
2 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -39,7 +39,6 @@ function ListJobsController (
vm.list = { iterator, name }; vm.list = { iterator, name };
vm.job_dataset = Dataset.data; vm.job_dataset = Dataset.data;
vm.jobs = Dataset.data.results; vm.jobs = Dataset.data.results;
vm.querySet = $state.params.job_search;
$scope.$watch('vm.job_dataset.count', () => { $scope.$watch('vm.job_dataset.count', () => {
$scope.$emit('updateCount', vm.job_dataset.count, 'jobs'); $scope.$emit('updateCount', vm.job_dataset.count, 'jobs');
@@ -237,6 +236,8 @@ function ListJobsController (
}; };
function refreshJobs () { function refreshJobs () {
console.log(SearchBasePath, $state.params.job_search);
console.log(vm.querySet);
qs.search(SearchBasePath, $state.params.job_search, { 'X-WS-Session-Quiet': true }) qs.search(SearchBasePath, $state.params.job_search, { 'X-WS-Session-Quiet': true })
.then(({ data }) => { .then(({ data }) => {
vm.jobs = data.results; vm.jobs = data.results;

4
awx/ui/client/features/jobs/jobsList.view.html
View File

@@ -9,7 +9,6 @@
dataset="vm.job_dataset" dataset="vm.job_dataset"
collection="vm.jobs" collection="vm.jobs"
search-tags="searchTags" search-tags="searchTags"
query-set="vm.querySet"
search-bar-full-width="vm.isPortalMode"> search-bar-full-width="vm.isPortalMode">
</smart-search> </smart-search>
</div> </div>
@@ -106,7 +105,6 @@
collection="vm.jobs" collection="vm.jobs"
dataset="vm.job_dataset" dataset="vm.job_dataset"
iterator="job" iterator="job"
base-path="{{vm.searchBasePath}}" base-path="{{vm.searchBasePath}}">
query-set="vm.querySet">
</paginate> </paginate>
</at-panel-body> </at-panel-body>