diff --git a/dmp-frontend/src/app/ui/dashboard/recent-edited-activity/recent-edited-activity.component.html b/dmp-frontend/src/app/ui/dashboard/recent-edited-activity/recent-edited-activity.component.html
index 26e66d4f9..068aba604 100644
--- a/dmp-frontend/src/app/ui/dashboard/recent-edited-activity/recent-edited-activity.component.html
+++ b/dmp-frontend/src/app/ui/dashboard/recent-edited-activity/recent-edited-activity.component.html
@@ -40,7 +40,7 @@
0 && listingItems.length < pageSize">
{{'GENERAL.ACTIONS.NO-MORE-AVAILABLE' | translate}}
- 0 && listingItems.length >= currentPage*pageSize" class="d-flex justify-content-center">
+
0 && listingItems.length >= currentPage*pageSize && !foundLastPage" class="d-flex justify-content-center">
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 e01451dda..eaefa4871 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
@@ -38,6 +38,7 @@ export class RecentEditedActivityComponent extends BaseComponent implements OnIn
currentPage: number = 0;
pageSize: number = 5;
listingItems: RecentActivityItem[]= [];
+ foundLastPage: boolean = false; // in case the total-items-count is equal to this.pageSize*this.currentPage
@Input() type: string;
@Input() includeDescriptions: boolean = false;
@@ -190,6 +191,7 @@ export class RecentEditedActivityComponent extends BaseComponent implements OnIn
this.listingItems = this.listingItems.slice(0, this.listingItems.length-latestBatchCount);
this._setPage(this.currentPage-1);
+ this.foundLastPage = false;
return;
}
@@ -227,6 +229,7 @@ export class RecentEditedActivityComponent extends BaseComponent implements OnIn
private _resetPagination(): void {
if (this.listingItems.length == 0) this.currentPage = 0;
else this.currentPage = Math.ceil(this.listingItems.length/this.pageSize);
+ this.foundLastPage = true;
this.updateUrl();
}