From d38925bbf118ccb9aae9979571ebd86dd68d93b7 Mon Sep 17 00:00:00 2001 From: Thomas Pinetz Date: Mon, 31 Aug 2015 14:01:04 +0200 Subject: [PATCH] Add Sort for multiple Columns --- src/main/javascript/base/SearchRequest.js | 11 ++++++++++- src/main/javascript/service/cat-search-service.js | 11 ++++++++++- 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/src/main/javascript/base/SearchRequest.js b/src/main/javascript/base/SearchRequest.js index e57ef1a..b65fc74 100644 --- a/src/main/javascript/base/SearchRequest.js +++ b/src/main/javascript/base/SearchRequest.js @@ -39,7 +39,16 @@ window.cat.SearchRequest = function (searchUrlParams) { } var _encodeSort = function () { - return (!!_sort.property ? 'sort=' + _sort.property + ':' + ((_sort.isDesc === true || _sort.isDesc === 'true') ? 'desc' : 'asc') : ''); + if(!!_sort.property) { + var properties = _sort.property.split(';'); + var result = 'sort='; + for(var i = 0; i< properties.length; i++) { + result += properties[i] + ':' + ((_sort.isDesc === true || _sort.isDesc === 'true') ? 'desc' : 'asc') + ';'; + } + return result.slice(0, -1); + } else { + return ''; + } }; var _encodePagination = function () { diff --git a/src/main/javascript/service/cat-search-service.js b/src/main/javascript/service/cat-search-service.js index c5e8bd5..5ad3b1b 100644 --- a/src/main/javascript/service/cat-search-service.js +++ b/src/main/javascript/service/cat-search-service.js @@ -39,7 +39,16 @@ angular.module('cat.service.search', []) .service('catSearchService', function ($location, catUrlEncodingService) { var _encodeSort = function (_sort) { - return (!!_sort.property ? 'sort=' + _sort.property + ':' + ((_sort.isDesc === true || _sort.isDesc === 'true') ? 'desc' : 'asc') : ''); + if(!!_sort.property) { + var properties = _sort.property.split(';'); + var result = 'sort='; + for(var i = 0; i< properties.length; i++) { + result += properties[i] + ':' + ((_sort.isDesc === true || _sort.isDesc === 'true') ? 'desc' : 'asc') + ';'; + } + return result.slice(0, -1); + } else { + return ''; + } }; var _encodePagination = function (_pagination) {