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

Merge pull request #3357 from mabashian/jobs-list-socket-refresh

Browse Source 
Fixes bug where jobs list search was lost on socket message

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
This commit is contained in:
softwarefactory-project-zuul[bot]
2019-03-04 20:52:29 +00:00
committed by GitHub
parent bf1769af6c 2359231bda
commit 2934fabd98
2 changed files with 1 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
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');

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>