Merge branch 'development' into next-release-3.2.0

This commit is contained in:
Eugenio Romano
2019-03-27 14:30:33 +00:00
committed by Eugenio Romano
120 changed files with 1583 additions and 13770 deletions

View File

@@ -40,7 +40,7 @@ describe('SearchSortingPickerComponent', () => {
<any> { 'key': 'description', 'label': 'Description', 'type': 'FIELD', 'field': 'cm:description', 'ascending': true }
],
defaults: [
<any> { 'key': 'name', 'type': 'FIELD', 'field': 'cm:name', 'ascending': true }
<any> { 'key': 'name', 'type': 'FIELD', 'field': 'cm:name', 'ascending': false }
]
},
categories: [
@@ -64,7 +64,7 @@ describe('SearchSortingPickerComponent', () => {
component.ngOnInit();
expect(component.value).toEqual('name');
expect(component.ascending).toBeTruthy();
expect(component.ascending).toBe(false);
});
it('should update query builder each time selection is changed', () => {

View File

@@ -39,7 +39,7 @@ export class SearchSortingPickerComponent implements OnInit {
const primary = this.queryBuilder.getPrimarySorting();
if (primary) {
this.value = primary.key;
this.ascending = this.getSortingOrder();
this.ascending = primary.ascending;
}
}