#150 Merge fixes

This commit is contained in:
Jonas Van Goolen
2017-11-15 10:28:11 +01:00
parent ee099e275c
commit d1b225bd95
7 changed files with 15 additions and 33 deletions

View File

@@ -64,12 +64,12 @@ export class ObjectGridComponent implements OnChanges, OnInit {
ngOnChanges(changes: SimpleChanges) {
if (changes.objects && !changes.objects.isFirstChange()) {
this.pageInfo = this.objects.pageInfo;
// this.pageInfo = this.objects.pageInfo;
}
}
ngOnInit(): void {
this.pageInfo = this.objects.pageInfo;
// this.pageInfo = this.objects.pageInfo;
}
/**