Merge branch 'master' into patch-1

Author: eduard93

MDX2JSON/Dashboard.cls.xml

@@ -210,6 +210,18 @@ Converts relevant parts of %DeepSee.Dashboard.Widget object into %ZEN.proxyObjec
 			do:(key'="") obj.properties.%DispatchSetProperty(key,property)
 		} while key'=""
 	}
+	
+	if Widget.overrides.Count()>0 {
+		set obj.overrides = $$$NewDynObjList
+		do {
+			set overridestr = Widget.overrides.GetNext(.key) // we take DeepSee widget override string (in "json" format)
+			quit:key=""
+			do ##class(%ZEN.Auxiliary.jsonProvider).%ConvertJSONToObject(overridestr,,.override,1) // convert it into %ZEN.proxyObject
+			if $IsObject(override) {
+				$$$Insert(obj.overrides,override)
+			}
+		} while key'=""
+	}
 
 	return obj
 ]]></Implementation>
@@ -254,25 +266,6 @@ Converts relevant parts of %DeepSee.Dashboard.Widget object into %ZEN.proxyObjec
 	{
 		$$$Insert(Obj.seriesTypes,Widget.dataSeries.GetAt(i).type)
 	}
-
-	set Obj.overrides = $$$NewDynObjList
-	do {
-		set overridestr = Widget.overrides.GetNext(.key) // we take DeepSee widget override string (in "json" format)
-		return:key=""
-
-
-		do ##class(%ZEN.Auxiliary.jsonProvider).%ConvertJSONToObject(overridestr,,.override,1) // convert it into %ZEN.proxyObject
-
-		#if ($$$IsNewJSON)&&($$$JSONEnabled) // if we are on new versions
-			set overridestr = ##class(MDX2JSON.AbstractREST).OutputToStr(override,"%ToJSON") // convert it into valid json
-			set override = ##class(%Object).$fromJSON(overridestr) // and into %Object
-		#endif
-
-		if $IsObject(override) {
-			$$$Insert(Obj.overrides,override)
-		}
-
-	} while key'=""
 ]]></Implementation>
 </Method>
 

MDX2JSON/Tests.cls.xml

@@ -8,12 +8,12 @@ Classes with support methods for testing MDX2JSON</Description>
 
 <Parameter name="LastCommit">
 <Type>%String</Type>
-<Default>744520a21a4b0ba4599aa7d2faf5e6544c656501</Default>
+<Default>837054cda0fc869888ffd57dd9d7a0a558d9911c</Default>
 </Parameter>
 
 <Parameter name="LastCommitTS">
 <Type>%TimeStamp</Type>
-<Default>2020-11-10 07:10:54.899</Default>
+<Default>2020-11-13 08:59:36.384</Default>
 </Parameter>
 
 <Method name="ProjectLength">

module.xml

@@ -2,7 +2,7 @@
 <Export generator="Cache" version="25">
 <Document name="MDX2JSON.ZPM"><Module>
  <Name>MDX2JSON</Name>
-  <Version>2.3.2</Version>
+  <Version>2.3.3</Version>
   <Description>RESTful web api for MDX to JSON transformation (plus JSONP and XML/A) for InterSystems Caché. Also provides information about DeepSee objects.</Description>
   <Packaging>module</Packaging>
   <SourcesRoot>./</SourcesRoot>