Skip to content

Commit 54e65f7

Browse files
committed
Merge branch 'master' of https://github.com/Frisle/MDX2JSON
2 parents 6abc88a + 291013f commit 54e65f7

2 files changed

Lines changed: 3 additions & 1 deletion

File tree

MDX2JSON/Dashboard.cls

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -252,7 +252,7 @@ ClassMethod WidgetControlToProxyObject(Widget As %DeepSee.Dashboard.Widget, Numb
252252
set obj.value = "&[" _ value _ "]"
253253
}
254254
}
255-
255+
// last OR is suppose to populate dashboard with values in case of applyVariable type filter
256256
set:((obj.action="applyFilter") || (obj.action="setFilter") || (obj.action="applyVariable")) obj.values = ..GetMembersForFilter(CubeName,obj.targetProperty)
257257
return obj
258258
}

MDX2JSON/DashboardFilters.cls

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,13 +48,15 @@ ClassMethod WidgetFiltersToProxyObject(Widget As %DeepSee.Dashboard.Widget, Cube
4848
/// Converts %DeepSee.Dashboard.Control object into %ZEN.proxyObject, handles run-time DeepSee variables.
4949
ClassMethod WidgetControlToProxyObject(Widget As %DeepSee.Dashboard.Widget, Number As %Integer, Cube As %String) As %ZEN.proxyObject [ Internal ]
5050
{
51+
// last OR is suppose to show filters variable in dropdown menu in case of applyVariable type filter
5152
return:((Widget.controls.GetAt(Number).action="applyFilter") || (Widget.controls.GetAt(Number).action="setFilter") || (Widget.controls.GetAt(Number).action="applyVariable")) ""
5253
return ##class(MDX2JSON.Dashboard).WidgetControlToProxyObject(Widget,Number,Cube)
5354
}
5455

5556
/// Converts %DeepSee.Dashboard.Control object into %ZEN.proxyObject, handles run-time DeepSee variables.
5657
ClassMethod WidgetFilterToProxyObject(Widget As %DeepSee.Dashboard.Widget, Number As %Integer, Cube As %String) As %ZEN.proxyObject [ Internal ]
5758
{
59+
// last OR is suppose to show filters variable in dropdown menu in case of applyVariable type filter
5860
return:'((Widget.controls.GetAt(Number).action="applyFilter") || (Widget.controls.GetAt(Number).action="setFilter") || (Widget.controls.GetAt(Number).action="applyVariable")) ""
5961
return ##class(MDX2JSON.Dashboard).WidgetControlToProxyObject(Widget,Number,Cube)
6062
}

0 commit comments

Comments
 (0)