From 2fb270d66c69e37bca0e699e20198a067f9a6280 Mon Sep 17 00:00:00 2001 From: George Kalampokis Date: Fri, 3 Jul 2020 10:47:04 +0300 Subject: [PATCH] Fix minor issues with the new merge --- .../recent-edited-activity.component.ts | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dmp-frontend/src/app/ui/dashboard/recent-edited-activity/recent-edited-activity.component.ts b/dmp-frontend/src/app/ui/dashboard/recent-edited-activity/recent-edited-activity.component.ts index 609fab7b3..aeaa2088e 100644 --- a/dmp-frontend/src/app/ui/dashboard/recent-edited-activity/recent-edited-activity.component.ts +++ b/dmp-frontend/src/app/ui/dashboard/recent-edited-activity/recent-edited-activity.component.ts @@ -67,9 +67,9 @@ export class RecentEditedActivityComponent extends BaseComponent implements OnIn allDataTableRequest.criteria = new RecentActivityCriteria(); allDataTableRequest.criteria.like = ""; this.dashboardService - .getPaged(allDataTableRequest) + .getRecentAcitvity(allDataTableRequest) .subscribe(response => { - this.allRecentActivities = response.data; + this.allRecentActivities = response; this.totalCountRecentEdited.emit(this.pageSize); }); } @@ -370,9 +370,9 @@ export class RecentEditedActivityComponent extends BaseComponent implements OnIn request.criteria = new RecentActivityCriteria(); request.criteria.like = ""; - this.dashboardService.getPaged(request).pipe(takeUntil(this._destroyed)).subscribe(result => { + this.dashboardService.getRecentAcitvity(request).pipe(takeUntil(this._destroyed)).subscribe(result => { if (!result) { return []; } - this.allRecentActivities = this.allRecentActivities.concat(result.data); + this.allRecentActivities = this.allRecentActivities.concat(result); }); this.startIndex = this.startIndex + this.pageSize;