From 56531976dea6985ecf17b1457430a0f23b643552 Mon Sep 17 00:00:00 2001
From: Ioannis Kalyvas <kalivasioan@gmail.com>
Date: Fri, 26 Jan 2018 18:08:17 +0200
Subject: [PATCH] no message

---
 .../java/eu/eudat/controllers/DatasetProfileController.java | 6 +++---
 .../src/app/dataset-wizard/dataset-wizard.component.ts      | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/dmp-backend/src/main/java/eu/eudat/controllers/DatasetProfileController.java b/dmp-backend/src/main/java/eu/eudat/controllers/DatasetProfileController.java
index ed4294bf7..3c0b6c114 100644
--- a/dmp-backend/src/main/java/eu/eudat/controllers/DatasetProfileController.java
+++ b/dmp-backend/src/main/java/eu/eudat/controllers/DatasetProfileController.java
@@ -38,16 +38,16 @@ public class DatasetProfileController extends BaseController {
     }
 
     @RequestMapping(method = RequestMethod.GET, value = {"/datasetwizard/get/{id}"}, produces = "application/json")
-    public ResponseEntity<ResponseItem<DatasetProfile>> getSingle(@PathVariable String id) {
+    public ResponseEntity<ResponseItem<PagedDatasetProfile>> getSingle(@PathVariable String id) {
         try {
             eu.eudat.entities.DatasetProfile profile = this.getApiContext().getDatabaseRepository().getDatasetProfileDao().find(UUID.fromString(id));
             eu.eudat.models.user.composite.DatasetProfile datasetprofile = UserManager.generateDatasetProfileModel(profile);
             PagedDatasetProfile pagedDatasetProfile = new PagedDatasetProfile();
             pagedDatasetProfile.buildPagedDatasetProfile(datasetprofile);
-            return ResponseEntity.status(HttpStatus.OK).body(new ResponseItem<DatasetProfile>().status(ApiMessageCode.NO_MESSAGE).payload(datasetprofile));
+            return ResponseEntity.status(HttpStatus.OK).body(new ResponseItem<PagedDatasetProfile>().status(ApiMessageCode.NO_MESSAGE).payload(pagedDatasetProfile));
         } catch (Exception ex) {
             ex.printStackTrace();
-            return ResponseEntity.status(HttpStatus.OK).body(new ResponseItem<DatasetProfile>().status(ApiMessageCode.DEFAULT_ERROR_MESSAGE).message(ex.getMessage()));
+            return ResponseEntity.status(HttpStatus.OK).body(new ResponseItem<PagedDatasetProfile>().status(ApiMessageCode.DEFAULT_ERROR_MESSAGE).message(ex.getMessage()));
         }
     }
 
diff --git a/dmp-frontend/src/app/dataset-wizard/dataset-wizard.component.ts b/dmp-frontend/src/app/dataset-wizard/dataset-wizard.component.ts
index 8aa4ccea0..e3a0225b9 100644
--- a/dmp-frontend/src/app/dataset-wizard/dataset-wizard.component.ts
+++ b/dmp-frontend/src/app/dataset-wizard/dataset-wizard.component.ts
@@ -128,7 +128,7 @@ export class DatasetWizardComponent {
   getDefinition() {
     if (this.isNew) {
       this.datasetWizardService.getDefinition(this.formGroup.get("profile").get("id").value).subscribe(item => {
-        this.datasetWizardModel.datasetProfileDefinition = item;
+        this.datasetWizardModel.datasetProfileDefinition = JsonSerializer.fromJSONObject(item,DatasetProfileDefinitionModel);
         //this.datasetProfileDefinitionModel = this.datasetWizardModel.datasetProfileDefinition;
         //this.form = this.datasetProfileDefinitionModel.buildForm();