From 3ec12fdf593e587e236b498bb8672fe59b8d469f Mon Sep 17 00:00:00 2001
From: amentis <amentis@cite.gr>
Date: Wed, 17 Apr 2024 18:29:22 +0300
Subject: [PATCH] description template has conflict bug fix

---
 .../editor/description-template-editor.component.ts | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/dmp-frontend/src/app/ui/admin/description-template/editor/description-template-editor.component.ts b/dmp-frontend/src/app/ui/admin/description-template/editor/description-template-editor.component.ts
index dd5f6e7eb..03f6efb79 100644
--- a/dmp-frontend/src/app/ui/admin/description-template/editor/description-template-editor.component.ts
+++ b/dmp-frontend/src/app/ui/admin/description-template/editor/description-template-editor.component.ts
@@ -202,15 +202,14 @@ export class DescriptionTemplateEditorComponent extends BaseEditor<DescriptionTe
 
 		if (id === null) {
 			route.push('../..');
-		} else if (this.isNew) {
-			route.push('../' + id);
-		} else if (this.isNewVersion || this.isClone) {
-			route.push('/description-templates');
-		} else {
-			route.push('..');
+			this.router.navigate(route, { queryParams: { 'lookup': this.queryParamsService.serializeLookup(this.lookupParams), 'lv': ++this.lv }, replaceUrl: true, relativeTo: this.route });
+		} else if (this.isNew || this.isNewVersion || this.isClone) {
+			route.push('/description-templates/' + id);
+			this.router.navigate(route, { queryParams: { 'lookup': this.queryParamsService.serializeLookup(this.lookupParams), 'lv': ++this.lv }, replaceUrl: true, relativeTo: this.route });
+		} else{
+			this.refreshData();
 		}
 
-		this.router.navigate(route, { queryParams: { 'lookup': this.queryParamsService.serializeLookup(this.lookupParams), 'lv': ++this.lv }, replaceUrl: true, relativeTo: this.route });
 	}
 
 	persistEntity(onSuccess?: (response) => void): void {