diff --git a/frontend/app/scripts/controllers/admin/taxonomy/TaxonomyListCtrl.js b/frontend/app/scripts/controllers/admin/taxonomy/TaxonomyListCtrl.js index 9ff31b9ae4..f64f83bfcb 100644 --- a/frontend/app/scripts/controllers/admin/taxonomy/TaxonomyListCtrl.js +++ b/frontend/app/scripts/controllers/admin/taxonomy/TaxonomyListCtrl.js @@ -6,10 +6,43 @@ .controller('TaxonomyDialogCtrl', TaxonomyDialogCtrl) .controller('TaxonomyImportCtrl', TaxonomyImportCtrl); - function TaxonomyListCtrl($scope, $uibModal, PaginatedQuerySrv, FilteringSrv, TaxonomySrv, NotificationSrv, ModalSrv, appConfig) { + function TaxonomyListCtrl($scope, $uibModal, PaginatedQuerySrv, FilteringSrv, TaxonomySrv, NotificationSrv, ModalSrv, QuerySrv, appConfig) { var self = this; this.appConfig = appConfig; + this.allTaxonomyCount = null; + + self.$onInit = function () { + self.filtering = new FilteringSrv('taxonomy', 'taxonomy.list', { + version: 'v1', + defaults: { + showFilters: true, + showStats: false, + pageSize: 15, + sort: ['+namespace'] + }, + defaultFilter: [] + }); + + self.filtering.initContext('list') + .then(function () { + self.load(); + + $scope.$watch('$vm.list.pageSize', function (newValue) { + self.filtering.setPageSize(newValue); + }); + }); + + QuerySrv.count( + 'v1', + [{ '_name': 'listTaxonomy' }], + { + name: 'all-taxonomy' + }) + .then(function (total) { + self.allTaxonomyCount = total; + }); + }; self.load = function () { this.loading = true; @@ -152,27 +185,6 @@ this.search(); }; - self.$onInit = function () { - self.filtering = new FilteringSrv('taxonomy', 'taxonomy.list', { - version: 'v1', - defaults: { - showFilters: true, - showStats: false, - pageSize: 15, - sort: ['+namespace'] - }, - defaultFilter: [] - }); - - self.filtering.initContext('list') - .then(function () { - self.load(); - - $scope.$watch('$vm.list.pageSize', function (newValue) { - self.filtering.setPageSize(newValue); - }); - }); - }; } function TaxonomyDialogCtrl($uibModalInstance, TaxonomySrv, NotificationSrv, taxonomy) { diff --git a/frontend/app/scripts/services/api/TaxonomyCacheSrv.js b/frontend/app/scripts/services/api/TaxonomyCacheSrv.js index b7d861be36..c3abfe94bc 100644 --- a/frontend/app/scripts/services/api/TaxonomyCacheSrv.js +++ b/frontend/app/scripts/services/api/TaxonomyCacheSrv.js @@ -11,11 +11,12 @@ return QuerySrv.call('v1', [ { _name: 'listTaxonomy' } ], { - name: 'list-taxonomies' - }, { - name: 'filter', - _field: 'enabled', - _value: true + name: 'list-taxonomies-cache', + filter: { + name: 'filter', + _field: 'enabled', + _value: true + } }); }; diff --git a/frontend/app/views/partials/admin/taxonomy/list.html b/frontend/app/views/partials/admin/taxonomy/list.html index f8aa93d385..240e44ef53 100644 --- a/frontend/app/views/partials/admin/taxonomy/list.html +++ b/frontend/app/views/partials/admin/taxonomy/list.html @@ -2,18 +2,20 @@
-

List of taxonomies

+ + +
-
+
-
@@ -52,7 +54,8 @@

List of taxonomies

- + List of taxonomies