yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

updates to package filtering to unselect a category

Browse Source
This commit is contained in:
Shannon
2016-06-13 13:29:51 +02:00
parent 441ea0cfaf
commit f5d3f9087f
2 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/Umbraco.Web.UI.Client/src/views/packager/views/repo.controller.js
View File

@@ -101,20 +101,29 @@
}
function selectCategory(selectedCategory, categories) {
var reset = false;
for (var i = 0; i < categories.length; i++) {
var category = categories[i];
if (category.name === selectedCategory.name && category.active === true) {
//it's already selected, let's unselect to show all again
reset = true;
}
category.active = false;
}
vm.loading = true;
vm.searchQuery = "";
var searchCategory = selectedCategory.name;
if (reset === true) {
searchCategory = "";
}
$q.all([
ourPackageRepositoryResource.getPopular(8, selectedCategory.name)
ourPackageRepositoryResource.getPopular(8, searchCategory)
.then(function(pack) {
vm.popular = pack.packages;
}),
ourPackageRepositoryResource.search(vm.pagination.pageNumber - 1, vm.pagination.pageSize, selectedCategory.name, vm.searchQuery)
ourPackageRepositoryResource.search(vm.pagination.pageNumber - 1, vm.pagination.pageSize, searchCategory, vm.searchQuery)
.then(function(pack) {
vm.packages = pack.packages;
vm.pagination.totalPages = Math.ceil(pack.total / vm.pagination.pageSize);
@@ -123,7 +132,7 @@
])
.then(function() {
vm.loading = false;
selectedCategory.active = true;
selectedCategory.active = reset === false;
});
}

2
src/Umbraco.Web.UI.Client/src/views/packager/views/repo.html
View File

@@ -86,7 +86,7 @@
</div> <!-- end packages -->
</div>
<div class="umb-packages__pagination">
<div class="umb-packages__pagination" ng-if="vm.pagination.totalPages > 1">
<umb-pagination page-number="vm.pagination.pageNumber"
total-pages="vm.pagination.totalPages"