From 8b77ab759abd5ac6cd6ab530eba2788cb6496e77 Mon Sep 17 00:00:00 2001
From: dtziotzios <dtziotzios@cite.gr>
Date: Thu, 31 Jan 2019 16:06:43 +0200
Subject: [PATCH] Small fixes on Project's endpoint listing.

---
 .../eudat/models/data/project/ProjectListingModel.java | 10 +++++-----
 .../src/app/core/services/project/project.service.ts   |  6 +++---
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/dmp-backend/web/src/main/java/eu/eudat/models/data/project/ProjectListingModel.java b/dmp-backend/web/src/main/java/eu/eudat/models/data/project/ProjectListingModel.java
index 63359cbd7..ae93cb757 100644
--- a/dmp-backend/web/src/main/java/eu/eudat/models/data/project/ProjectListingModel.java
+++ b/dmp-backend/web/src/main/java/eu/eudat/models/data/project/ProjectListingModel.java
@@ -174,6 +174,11 @@ public class ProjectListingModel implements DataModel<eu.eudat.data.entities.Pro
     public ProjectListingModel fromDataModel(eu.eudat.data.entities.Project entity) {
         this.id = entity.getId();
         this.label = entity.getLabel();
+        return this;
+    }
+
+    public ProjectListingModel fromDataModelWIthDmps(eu.eudat.data.entities.Project entity) {
+        this.fromDataModel(entity);
         this.abbreviation = entity.getAbbreviation();
         this.reference = entity.getReference();
         this.uri = entity.getUri();
@@ -185,11 +190,6 @@ public class ProjectListingModel implements DataModel<eu.eudat.data.entities.Pro
         this.modified = entity.getModified();
         this.description = entity.getDescription();
         this.files = entity.getContent() != null ? Arrays.asList(new ContentFile(entity.getContent().getLabel(), UUID.fromString(entity.getContent().getUri().split(":")[1]), "final", entity.getContent().getExtension())) : Arrays.asList(new ContentFile("default.png", null, null, null));
-        return this;
-    }
-
-    public ProjectListingModel fromDataModelWIthDmps(eu.eudat.data.entities.Project entity) {
-        this.fromDataModel(entity);
         this.dmps = entity.getDmps().stream().map(item -> new DataManagementPlanUrlListing().fromDataModel(item)).collect(Collectors.toList());
         return this;
     }
diff --git a/dmp-frontend/src/app/core/services/project/project.service.ts b/dmp-frontend/src/app/core/services/project/project.service.ts
index 566ffb715..c9af2967c 100644
--- a/dmp-frontend/src/app/core/services/project/project.service.ts
+++ b/dmp-frontend/src/app/core/services/project/project.service.ts
@@ -20,11 +20,11 @@ export class ProjectService {
 		this.actionUrl = environment.Server + 'projects/';
 	}
 
-	getPaged(dataTableRequest: DataTableRequest<ProjectCriteria>,fieldsGroup?: string): Observable<DataTableData<ProjectListingModel>> {
-		if(fieldsGroup){
+	getPaged(dataTableRequest: DataTableRequest<ProjectCriteria>, fieldsGroup?: string): Observable<DataTableData<ProjectListingModel>> {
+		if (fieldsGroup) {
 			return this.http.post<DataTableData<ProjectListingModel>>(this.actionUrl + 'paged?fieldsGroup=' + fieldsGroup, dataTableRequest, { headers: this.headers });
 		}
-		else{
+		else {
 			return this.http.post<DataTableData<ProjectListingModel>>(this.actionUrl + 'paged?fieldsGroup=' + 'autocomplete', dataTableRequest, { headers: this.headers });
 		}
 	}