From 6d1ecca154d343a40243989718ce47d26075b758 Mon Sep 17 00:00:00 2001
From: gpapavgeri <gpapavgeri@cite.gr>
Date: Thu, 23 Jul 2020 17:24:02 +0300
Subject: [PATCH] routerLink changed in dataset-listing-item & delete updated
 for dataset-overview

---
 .../listing/listing-item/dataset-listing-item.component.html    | 2 +-
 .../src/app/ui/dataset/overview/dataset-overview.component.html | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/dmp-frontend/src/app/ui/dataset/listing/listing-item/dataset-listing-item.component.html b/dmp-frontend/src/app/ui/dataset/listing/listing-item/dataset-listing-item.component.html
index 3e588a713..67b5c92ad 100644
--- a/dmp-frontend/src/app/ui/dataset/listing/listing-item/dataset-listing-item.component.html
+++ b/dmp-frontend/src/app/ui/dataset/listing/listing-item/dataset-listing-item.component.html
@@ -1,5 +1,5 @@
 <div class="dataset-card">
-	<a [routerLink]="['../datasets/overview/' + dataset.id]" class="pointer">
+	<a [routerLink]="isPublic ? ['/datasets/publicOverview/' + dataset.id] : ['/datasets/overview/' + dataset.id]" class="pointer">
 		<div class="d-flex flex-direction-row">
 			<div class="col-auto dataset-label">{{'DATASET-LISTING.DATASET-DESCRIPTION' | translate}}</div>
 			<div class="col-auto ml-auto edited-date">{{'DATASET-LISTING.STATES.EDITED' | translate}}: {{dataset.modified | date:"longDate"}}</div>
diff --git a/dmp-frontend/src/app/ui/dataset/overview/dataset-overview.component.html b/dmp-frontend/src/app/ui/dataset/overview/dataset-overview.component.html
index 4010e7440..c63b00497 100644
--- a/dmp-frontend/src/app/ui/dataset/overview/dataset-overview.component.html
+++ b/dmp-frontend/src/app/ui/dataset/overview/dataset-overview.component.html
@@ -54,7 +54,7 @@
 							matTooltip="{{'DMP-LISTING.ACTIONS.EDIT' | translate}}" matTooltipPosition="above">
 							<mat-icon class="mat-mini-fab-icon">create</mat-icon>
 						</button>
-						<button *ngIf="!lockStatus" (click)="deleteClicked()" mat-mini-fab
+						<button *ngIf="isUserDatasetRelated() && !lockStatus" (click)="deleteClicked()" mat-mini-fab
 							class="mr-3 actions-btn" matTooltip="{{'DMP-LISTING.ACTIONS.DELETE' | translate}}"
 							matTooltipPosition="above">
 							<mat-icon class="mat-mini-fab-icon">delete</mat-icon>