nosu
/
taskana
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

TSK-538 Bug order by description issue is now fixed.

This commit is contained in:
Martin Rojas Miguel Angel 2018-06-04 13:11:22 +02:00 committed by Holger Hagen
parent 99e3c15e89
commit 712d8b435b
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
rest/taskana-rest-spring/src/main/java/pro/taskana/rest/WorkbasketController.java
View File

@ -68,6 +68,7 @@ public class WorkbasketController extends AbstractPagingController {
private static final String DOMAIN = "domain"; private static final String DOMAIN = "domain";
private static final String REQUIRED_PERMISSION = "required-permission"; private static final String REQUIRED_PERMISSION = "required-permission";
private static final String TYPE = "type"; private static final String TYPE = "type";
private static final String DESCRIPTION = "description";
private static final String SORT_BY = "sort-by"; private static final String SORT_BY = "sort-by";
private static final String SORT_DIRECTION = "order"; private static final String SORT_DIRECTION = "order";
@ -277,6 +278,9 @@ public class WorkbasketController extends AbstractPagingController {
case (TYPE): case (TYPE):
query = query.orderByType(sortDirection); query = query.orderByType(sortDirection);
break; break;
case (DESCRIPTION):
query = query.orderByDescription(sortDirection);
break;
default: default:
throw new IllegalArgumentException("Unknown order '" + sortBy + "'"); throw new IllegalArgumentException("Unknown order '" + sortBy + "'");
} }

2
web/src/app/administration/workbasket/master/list/workbasket-list.component.html
View File

@ -27,7 +27,7 @@
</div> </div>
<taskana-spinner [isRunning]="requestInProgress"></taskana-spinner> <taskana-spinner [isRunning]="requestInProgress"></taskana-spinner>
<ng-template #empty_workbaskets> <ng-template #empty_workbaskets>
<div class="col-xs-12 container-no-items center-block"> <div *ngIf="!requestInProgress" class="col-xs-12 container-no-items center-block">
<h3 class="grey">There are no workbaskets</h3> <h3 class="grey">There are no workbaskets</h3>
<svg-icon class="img-responsive empty-icon" src="./assets/icons/wb-empty.svg"></svg-icon> <svg-icon class="img-responsive empty-icon" src="./assets/icons/wb-empty.svg"></svg-icon>
</div> </div>