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

Fixes the search sorting for the packages section against our

Browse Source
This commit is contained in:
Shannon
2016-08-10 11:41:58 +02:00
parent d99a691bdc
commit 5bd5bf87ad
2 changed files with 17 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/Umbraco.Web.UI.Client/src/common/resources/ourpackagerrepository.resource.js
View File

@@ -37,13 +37,13 @@ function ourPackageRepositoryResource($q, $http, umbDataFormatter, umbRequestHel
'Failed to query packages');
},
search: function (pageIndex, pageSize, category, query, canceler) {
search: function (pageIndex, pageSize, orderBy, category, query, canceler) {
var httpConfig = {};
if (canceler) {
httpConfig["timeout"] = canceler;
}
if (category === undefined) {
category = "";
}
@@ -51,8 +51,11 @@ function ourPackageRepositoryResource($q, $http, umbDataFormatter, umbRequestHel
query = "";
}
//order by score if there is nothing set
var order = !orderBy ? "&order=Default" : ("&order=" + orderBy);
return umbRequestHelper.resourcePromise(
$http.get(baseurl + "?pageIndex=" + pageIndex + "&pageSize=" + pageSize + "&category=" + category + "&query=" + query),
$http.get(baseurl + "?pageIndex=" + pageIndex + "&pageSize=" + pageSize + "&category=" + category + "&query=" + query + order),
httpConfig,
'Failed to query packages');
}

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

@@ -31,6 +31,7 @@
vm.closeLightbox = closeLightbox;
vm.search = search;
var currSort = "Latest";
//used to cancel any request in progress if another one needs to take it's place
var canceler = null;
@@ -59,7 +60,7 @@
.then(function(pack) {
vm.popular = pack.packages;
}),
ourPackageRepositoryResource.search(vm.pagination.pageNumber - 1, vm.pagination.pageSize)
ourPackageRepositoryResource.search(vm.pagination.pageNumber - 1, vm.pagination.pageSize, currSort)
.then(function(pack) {
vm.packages = pack.packages;
vm.pagination.totalPages = Math.ceil(pack.total / vm.pagination.pageSize);
@@ -89,12 +90,14 @@
searchCategory = "";
}
currSort = "Latest";
$q.all([
ourPackageRepositoryResource.getPopular(8, searchCategory)
.then(function(pack) {
vm.popular = pack.packages;
}),
ourPackageRepositoryResource.search(vm.pagination.pageNumber - 1, vm.pagination.pageSize, searchCategory, vm.searchQuery)
ourPackageRepositoryResource.search(vm.pagination.pageNumber - 1, vm.pagination.pageSize, currSort, searchCategory, vm.searchQuery)
.then(function(pack) {
vm.packages = pack.packages;
vm.pagination.totalPages = Math.ceil(pack.total / vm.pagination.pageSize);
@@ -132,7 +135,7 @@
}
function nextPage(pageNumber) {
ourPackageRepositoryResource.search(pageNumber - 1, vm.pagination.pageSize, getActiveCategory(), vm.searchQuery)
ourPackageRepositoryResource.search(pageNumber - 1, vm.pagination.pageSize, currSort, getActiveCategory(), vm.searchQuery)
.then(function (pack) {
vm.packages = pack.packages;
vm.pagination.totalPages = Math.ceil(pack.total / vm.pagination.pageSize);
@@ -140,7 +143,7 @@
}
function prevPage(pageNumber) {
ourPackageRepositoryResource.search(pageNumber - 1, vm.pagination.pageSize, getActiveCategory(), vm.searchQuery)
ourPackageRepositoryResource.search(pageNumber - 1, vm.pagination.pageSize, currSort, getActiveCategory(), vm.searchQuery)
.then(function (pack) {
vm.packages = pack.packages;
vm.pagination.totalPages = Math.ceil(pack.total / vm.pagination.pageSize);
@@ -148,7 +151,7 @@
}
function goToPage(pageNumber) {
ourPackageRepositoryResource.search(pageNumber - 1, vm.pagination.pageSize, getActiveCategory(), vm.searchQuery)
ourPackageRepositoryResource.search(pageNumber - 1, vm.pagination.pageSize, currSort, getActiveCategory(), vm.searchQuery)
.then(function (pack) {
vm.packages = pack.packages;
vm.pagination.totalPages = Math.ceil(pack.total / vm.pagination.pageSize);
@@ -248,8 +251,11 @@
canceler = $q.defer();
}
currSort = vm.searchQuery ? "Default" : "Latest";
ourPackageRepositoryResource.search(vm.pagination.pageNumber - 1,
vm.pagination.pageSize,
currSort,
"",
vm.searchQuery,
canceler)