From ca5f27aa9e766f5c165b8478d2263f74723de714 Mon Sep 17 00:00:00 2001 From: mabashian Date: Mon, 4 Mar 2019 15:03:52 -0500 Subject: [PATCH] Removes vm.querySet from jobs list and ensures that state params are updated when search is performed to prevent context loss on data refresh. --- awx/ui/client/features/jobs/jobsList.controller.js | 3 ++- awx/ui/client/features/jobs/jobsList.view.html | 4 +--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/awx/ui/client/features/jobs/jobsList.controller.js b/awx/ui/client/features/jobs/jobsList.controller.js index 16e19be996..6e9186a810 100644 --- a/awx/ui/client/features/jobs/jobsList.controller.js +++ b/awx/ui/client/features/jobs/jobsList.controller.js @@ -39,7 +39,6 @@ function ListJobsController ( vm.list = { iterator, name }; vm.job_dataset = Dataset.data; vm.jobs = Dataset.data.results; - vm.querySet = $state.params.job_search; $scope.$watch('vm.job_dataset.count', () => { $scope.$emit('updateCount', vm.job_dataset.count, 'jobs'); @@ -237,6 +236,8 @@ function ListJobsController ( }; 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 }) .then(({ data }) => { vm.jobs = data.results; diff --git a/awx/ui/client/features/jobs/jobsList.view.html b/awx/ui/client/features/jobs/jobsList.view.html index d32d74a7e2..812f94d9bf 100644 --- a/awx/ui/client/features/jobs/jobsList.view.html +++ b/awx/ui/client/features/jobs/jobsList.view.html @@ -9,7 +9,6 @@ dataset="vm.job_dataset" collection="vm.jobs" search-tags="searchTags" - query-set="vm.querySet" search-bar-full-width="vm.isPortalMode"> @@ -106,7 +105,6 @@ collection="vm.jobs" dataset="vm.job_dataset" iterator="job" - base-path="{{vm.searchBasePath}}" - query-set="vm.querySet"> + base-path="{{vm.searchBasePath}}">