Skip to content

Add Sort for multiple Columns #36

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
mangei wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Add Sort for multiple Columns #36

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 10 additions & 1 deletion src/main/javascript/base/SearchRequest.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Copy link
Contributor

@tsalzinger tsalzinger Sep 28, 2015

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

is the last ; really an issue?

Copy link

@tpinetz tpinetz Sep 28, 2015

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I am actually not sure, I would have to test it. Previously there was no ; before so i did not want to add one now. I will test this as soon as I have the time.

} else {
return '';
}
};

var _encodePagination = function () {
Expand Down
11 changes: 10 additions & 1 deletion src/main/javascript/service/cat-search-service.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down