From f44951156ab374acdde39bce4d3a24c80d290eb9 Mon Sep 17 00:00:00 2001
From: Mirco Nasuti <mirco.nasuti@chuv.ch>
Date: Thu, 15 Sep 2016 14:23:49 +0200
Subject: [PATCH] details
---
src/main/java/eu/hbp/mip/controllers/ModelsApi.java | 13 ++++++-------
1 file changed, 6 insertions(+), 7 deletions(-)
diff --git a/src/main/java/eu/hbp/mip/controllers/ModelsApi.java b/src/main/java/eu/hbp/mip/controllers/ModelsApi.java
index af318afa5..7eb179dde 100644
--- a/src/main/java/eu/hbp/mip/controllers/ModelsApi.java
+++ b/src/main/java/eu/hbp/mip/controllers/ModelsApi.java
@@ -117,8 +117,6 @@ public class ModelsApi {
LOGGER.info("Create a model");
- model = getModelWithDataset(model);
-
User user = securityConfiguration.getUser();
model.setTitle(model.getConfig().getTitle().get("text"));
@@ -129,7 +127,8 @@ public class ModelsApi {
model.setValid(false);
}
- long count = 1;
+ // Ensure the title is unique
+ long count = 1; //
for(int i = 1; count > 0; i++)
{
count = modelRepository.countByTitle(model.getTitle());
@@ -145,14 +144,16 @@ public class ModelsApi {
}
}
+ // Slugify
String slug = null;
try {
slug = new Slugify().slugify(model.getTitle());
} catch (IOException e) {
- slug = "";
+ slug = ""; // Should never happen
LOGGER.trace(e);
}
+ // Ensure slug is unique
boolean alreadyExists = true;
for(int i = 1; alreadyExists; i++)
{
@@ -205,9 +206,7 @@ public class ModelsApi {
User user = securityConfiguration.getUser();
- Model model = null;
-
- model = modelRepository.findOne(slug);
+ Model model = modelRepository.findOne(slug);
if (!model.getValid() && !model.getCreatedBy().getUsername().equals(user.getUsername()))
{
return new ResponseEntity<>(HttpStatus.FORBIDDEN);
--
GitLab