From 8615725d7e4cd261fbe54dd1ea873cabc06fcdbd Mon Sep 17 00:00:00 2001
From: pkupczyk <piotr.kupczyk@id.ethz.ch>
Date: Tue, 8 Nov 2022 14:31:34 +0100
Subject: [PATCH] SSDM-13152 : Exports for master data and metadata UI - fix a
problem with deserialization of custom service results
---
.../cisd/openbis/public/resources/api/v3/util/Json.js | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/util/Json.js b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/util/Json.js
index 5b7b47799bf..556741631d5 100644
--- a/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/util/Json.js
+++ b/openbis/source/java/ch/systemsx/cisd/openbis/public/resources/api/v3/util/Json.js
@@ -159,11 +159,11 @@ define([ 'jquery', 'underscore' ], function(jquery, _) {
}
} else if (jsonObject instanceof Object) {
if (jsonObject["@id"] && jsonObject["@type"]) {
- var jsonTypeArguments = jsonType ? jsonType["arguments"] : null
+ var jsonTypeArguments = (jsonType && jsonType["arguments"]) ? jsonType["arguments"] : null
return fromJsonObjectWithType(jsonTypeArguments, jsonObject, objectMap, modulesMap)
} else {
var map = {};
- var jsonType = jsonType ? jsonType["arguments"][1] : null;
+ var jsonType = (jsonType && jsonType["arguments"] && jsonType["arguments"].length > 1) ? jsonType["arguments"][1] : null;
Object.keys(jsonObject).forEach(function(key) {
var dto = fromJsonObjectWithTypeOrArrayOrMap(jsonType, jsonObject[key], objectMap, modulesMap);
--
GitLab