Merge pull request #80 from Njektt/class-Dashboard

eduard93 · web-flow · commit 0f8dd1b4dcd9 · 2022-11-21T19:50:50.000+04:00
Fix "override" field data type in data properties widget
diff --git a/MDX2JSON/Dashboard.cls.xml b/MDX2JSON/Dashboard.cls.xml
@@ -192,7 +192,10 @@ Converts relevant parts of %DeepSee.Dashboard.Widget object into %ZEN.proxyObjec
 	
 	for i=1:1:Widget.dataProperties.Count()
 	{
-		set dataProperty = ..WidgetDataPropertyToProxyObject(Widget.dataProperties.GetAt(i))
+		set widgetData = Widget.dataProperties.GetAt(i)
+		d ##class(%ZEN.Auxiliary.jsonProvider).%ConvertJSONToObject(widgetData.override,,.override)
+		set widgetData.override = override
+		set dataProperty = ..WidgetDataPropertyToProxyObject(widgetData)
 		if $IsObject(dataProperty) {
 			$$$Insert(obj.dataProperties,dataProperty)
 		}

Original file line number	Diff line number	Diff line change
`@@ -192,7 +192,10 @@ Converts relevant parts of %DeepSee.Dashboard.Widget object into %ZEN.proxyObjec`
`192`	`192`
`193`	`193`	`for i=1:1:Widget.dataProperties.Count()`
`194`	`194`	`{`
`195`		`- set dataProperty = ..WidgetDataPropertyToProxyObject(Widget.dataProperties.GetAt(i))`
	`195`	`+ set widgetData = Widget.dataProperties.GetAt(i)`
	`196`	`+ d ##class(%ZEN.Auxiliary.jsonProvider).%ConvertJSONToObject(widgetData.override,,.override)`
	`197`	`+ set widgetData.override = override`
	`198`	`+ set dataProperty = ..WidgetDataPropertyToProxyObject(widgetData)`
`196`	`199`	`if $IsObject(dataProperty) {`
`197`	`200`	`$$$Insert(obj.dataProperties,dataProperty)`
`198`	`201`	`}`