External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-03-07 19:51:08 -03:30
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2532 from mabashian/1882-templates-list

Browse Source 
Remove updateDataset listener from templates list controller
This commit is contained in:
Michael Abashian
2018-07-16 10:31:29 -04:00
committed by GitHub
parent 62967b2806 f7dda124b1
commit 4e8fff8cf1
2 changed files with 18 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
awx/ui/client/features/templates/templatesList.controller.js
View File

@@ -51,17 +51,16 @@ function ListTemplatesController(
$scope.canAdd = ($scope.canAddJobTemplate || $scope.canAddWorkflowJobTemplate); $scope.canAdd = ($scope.canAddJobTemplate || $scope.canAddWorkflowJobTemplate);
// smart-search // smart-search
$scope.list = { vm.list = {
iterator: 'template', iterator: 'template',
name: 'templates' name: 'templates'
}; };
$scope.collection = { vm.dataset = Dataset.data;
iterator: 'template', vm.templates = Dataset.data.results;
basePath: 'unified_job_templates'
}; $scope.$watch('vm.dataset.count', () => {
$scope.template_dataset = Dataset.data; $scope.$emit('updateCount', vm.dataset.count, 'templates');
$scope.templates = Dataset.data.results; });
$scope.$emit('updateCount', Dataset.data.count, 'templates');
$scope.$watch('$state.params', function(newValue, oldValue) { $scope.$watch('$state.params', function(newValue, oldValue) {
const job_template_id = _.get($state.params, 'job_template_id'); const job_template_id = _.get($state.params, 'job_template_id');
@@ -72,12 +71,6 @@ function ListTemplatesController(
} }
}, true); }, true);
$scope.$on('updateDataset', (e, dataset) => {
$scope.template_dataset = dataset;
$scope.templates = dataset.results;
$scope.$emit('updateCount', dataset.count, 'templates');
});
$scope.$on(`ws-jobs`, () => { $scope.$on(`ws-jobs`, () => {
if (!launchModalOpen) { if (!launchModalOpen) {
refreshTemplates(); refreshTemplates();
@@ -188,8 +181,8 @@ function ListTemplatesController(
let path = GetBasePath('unified_job_templates'); let path = GetBasePath('unified_job_templates');
qs.search(path, $state.params.template_search) qs.search(path, $state.params.template_search)
.then(function(searchResponse) { .then(function(searchResponse) {
$scope.template_dataset = searchResponse.data; vm.dataset = searchResponse.data;
$scope.templates = $scope.template_dataset.results; vm.templates = vm.dataset.results;
}); });
} }
@@ -254,7 +247,7 @@ function ListTemplatesController(
const { page } = _.get($state.params, 'template_search'); const { page } = _.get($state.params, 'template_search');
let reloadListStateParams = null; let reloadListStateParams = null;
if ($scope.templates.length === 1 && page && page !== '1') { if (vm.templates.length === 1 && page && page !== '1') {
reloadListStateParams = _.cloneDeep($state.params); reloadListStateParams = _.cloneDeep($state.params);
const pageNumber = (parseInt(reloadListStateParams.template_search.page, 0) - 1); const pageNumber = (parseInt(reloadListStateParams.template_search.page, 0) - 1);
reloadListStateParams.template_search.page = pageNumber.toString(); reloadListStateParams.template_search.page = pageNumber.toString();

18
awx/ui/client/features/templates/templatesList.view.html
View File

@@ -5,11 +5,10 @@
django-model="templates" django-model="templates"
base-path="unified_job_templates" base-path="unified_job_templates"
iterator="template" iterator="template"
list="list" list="vm.list"
dataset="template_dataset" collection="vm.templates"
collection="collection" dataset="vm.dataset"
search-tags="searchTags" search-tags="vm.searchTags"
query-set="querySet"
search-bar-full-width="vm.isPortalMode"> search-bar-full-width="vm.isPortalMode">
</smart-search> </smart-search>
<div class="at-List-toolbarAction" ng-show="!vm.isPortalMode && canAdd"> <div class="at-List-toolbarAction" ng-show="!vm.isPortalMode && canAdd">
@@ -37,7 +36,7 @@
</div> </div>
</div> </div>
<at-list results="templates" id="templates_list"> <at-list results="templates" id="templates_list">
<at-row ng-repeat="template in templates" <at-row ng-repeat="template in vm.templates"
ng-class="{'at-Row--active': (template.id === vm.activeId)}" ng-class="{'at-Row--active': (template.id === vm.activeId)}"
template-id="{{ template.id }}" template-id="{{ template.id }}"
invalid="vm.isInvalid(template)" invalid="vm.isInvalid(template)"
@@ -100,10 +99,9 @@
</at-row> </at-row>
</at-list> </at-list>
<paginate <paginate
collection="collection" collection="vm.templates"
dataset="template_dataset" dataset="vm.dataset"
iterator="template" iterator="template"
base-path="unified_job_templates" base-path="unified_job_templates">
query-set="querySet">
</paginate> </paginate>
</at-panel-body> </at-panel-body>