diff --git a/dmp-backend/web/src/main/java/eu/eudat/logic/utilities/documents/word/WordBuilder.java b/dmp-backend/web/src/main/java/eu/eudat/logic/utilities/documents/word/WordBuilder.java index c746ae053..df9549b8d 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/logic/utilities/documents/word/WordBuilder.java +++ b/dmp-backend/web/src/main/java/eu/eudat/logic/utilities/documents/word/WordBuilder.java @@ -16,6 +16,7 @@ import org.apache.poi.openxml4j.exceptions.InvalidFormatException; import org.apache.poi.util.Units; import org.apache.poi.xwpf.usermodel.*; import org.json.JSONArray; +import org.json.JSONException; import org.jsoup.Jsoup; import org.jsoup.nodes.Document; import org.openxmlformats.schemas.wordprocessingml.x2006.main.*; @@ -378,15 +379,19 @@ public class WordBuilder { if((format == null || format.isEmpty()) || (attribute == null || attribute.isEmpty())){ return null; } - JSONArray array = new JSONArray(JavaToJson.objectStringToJson(format)); - StringBuilder multipleFormats = new StringBuilder(); - for (int i = 0; i < array.length(); i++) { - multipleFormats.append(array.getJSONObject(i).getString(attribute)).append(", "); + try { + JSONArray array = new JSONArray(JavaToJson.objectStringToJson(format)); + StringBuilder multipleFormats = new StringBuilder(); + for (int i = 0; i < array.length(); i++) { + multipleFormats.append(array.getJSONObject(i).getString(attribute)).append(", "); + } + if (multipleFormats.length() > 0) { + multipleFormats.setLength(multipleFormats.length() - 2); + } + return multipleFormats.toString(); + } catch (JSONException e) { + return format; } - if (multipleFormats.length() > 0) { - multipleFormats.setLength(multipleFormats.length() - 2); - } - return multipleFormats.toString(); } public XWPFParagraph addParagraphContent(Object content, XWPFDocument mainDocumentPart, ParagraphStyle style, BigInteger numId) { diff --git a/dmp-backend/web/src/main/java/eu/eudat/models/data/dashboard/recent/model/RecentActivityModel.java b/dmp-backend/web/src/main/java/eu/eudat/models/data/dashboard/recent/model/RecentActivityModel.java index 10b30b87b..4ea17cd64 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/models/data/dashboard/recent/model/RecentActivityModel.java +++ b/dmp-backend/web/src/main/java/eu/eudat/models/data/dashboard/recent/model/RecentActivityModel.java @@ -18,6 +18,7 @@ public abstract class RecentActivityModel users; private Boolean isPublic; @@ -94,6 +95,14 @@ public abstract class RecentActivityModel{{ 'TYPES.DATASET-STATUS.DRAFT' | translate }} ({{'DMP-FINALISE-DIALOG.INVALID' | translate}}) - + : {{ dataset.label }} @@ -50,7 +50,7 @@
- {{ dataset.label }} + {{ dataset.label }}