From 637e1cb53fef333ef5ad3fa4a3b42e0259f57b89 Mon Sep 17 00:00:00 2001 From: sgiannopoulos Date: Fri, 28 Jun 2024 14:33:06 +0300 Subject: [PATCH] bug fix --- .../main/java/eu/old/eudat/migration/DmpMigrationService.java | 3 +++ .../java/eu/old/eudat/migration/GrantMigrationService.java | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/dmp-migration-tool/web/src/main/java/eu/old/eudat/migration/DmpMigrationService.java b/dmp-migration-tool/web/src/main/java/eu/old/eudat/migration/DmpMigrationService.java index 4c2e436b3..ad35b0b4d 100644 --- a/dmp-migration-tool/web/src/main/java/eu/old/eudat/migration/DmpMigrationService.java +++ b/dmp-migration-tool/web/src/main/java/eu/old/eudat/migration/DmpMigrationService.java @@ -134,6 +134,9 @@ public class DmpMigrationService { } } } + if (data.getCreatorId() == null && item.getCreator() != null && item.getCreator().getId() != null) { + data.setCreatorId(item.getCreator().getId()); + } data.setGroupId(model.getGroupId()); data.setVersion((short) model.getVersion()); if (currentVersionDmp != null && currentVersionDmp.getId().equals(item.getId())){ diff --git a/dmp-migration-tool/web/src/main/java/eu/old/eudat/migration/GrantMigrationService.java b/dmp-migration-tool/web/src/main/java/eu/old/eudat/migration/GrantMigrationService.java index b98497c3e..af58599e5 100644 --- a/dmp-migration-tool/web/src/main/java/eu/old/eudat/migration/GrantMigrationService.java +++ b/dmp-migration-tool/web/src/main/java/eu/old/eudat/migration/GrantMigrationService.java @@ -65,7 +65,7 @@ GrantMigrationService { ReferenceEntity data = new ReferenceEntity(); data.setId(item.getId()); - data.setLabel(item.getLabel()); + data.setLabel(item.getLabel() +" (" + referenceParts[1] + ")"); data.setDescription(item.getDescription()); data.setAbbreviation(item.getAbbreviation()); data.setIsActive(IsActive.Active);