Fix minor issues with the new merge
This commit is contained in:
parent
4531a5d61e
commit
2fb270d66c
|
@ -67,9 +67,9 @@ export class RecentEditedActivityComponent extends BaseComponent implements OnIn
|
||||||
allDataTableRequest.criteria = new RecentActivityCriteria();
|
allDataTableRequest.criteria = new RecentActivityCriteria();
|
||||||
allDataTableRequest.criteria.like = "";
|
allDataTableRequest.criteria.like = "";
|
||||||
this.dashboardService
|
this.dashboardService
|
||||||
.getPaged(allDataTableRequest)
|
.getRecentAcitvity(allDataTableRequest)
|
||||||
.subscribe(response => {
|
.subscribe(response => {
|
||||||
this.allRecentActivities = response.data;
|
this.allRecentActivities = response;
|
||||||
this.totalCountRecentEdited.emit(this.pageSize);
|
this.totalCountRecentEdited.emit(this.pageSize);
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
@ -370,9 +370,9 @@ export class RecentEditedActivityComponent extends BaseComponent implements OnIn
|
||||||
request.criteria = new RecentActivityCriteria();
|
request.criteria = new RecentActivityCriteria();
|
||||||
request.criteria.like = "";
|
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 []; }
|
if (!result) { return []; }
|
||||||
this.allRecentActivities = this.allRecentActivities.concat(result.data);
|
this.allRecentActivities = this.allRecentActivities.concat(result);
|
||||||
});
|
});
|
||||||
this.startIndex = this.startIndex + this.pageSize;
|
this.startIndex = this.startIndex + this.pageSize;
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue