Merge pull request #8 from Frisle/master

FIX:Dropdown menu in case of applyVariable type filters

Author: jakcpto

MDX2JSON/Dashboard.cls

@@ -255,8 +255,8 @@ ClassMethod WidgetControlToProxyObject(Widget As %DeepSee.Dashboard.Widget, Numb
 			set obj.value = "&[" _ value _ "]"
 		}
 	}
-
-	set:((obj.action="applyFilter") || (obj.action="setFilter")) obj.values = ..GetMembersForFilter(CubeName,obj.targetProperty)
+	// last OR is suppose to populate dashboard with values in case of applyVariable type filter
+	set:((obj.action="applyFilter") || (obj.action="setFilter") || (obj.action="applyVariable")) obj.values = ..GetMembersForFilter(CubeName,obj.targetProperty)
 	return obj
 }
 

MDX2JSON/DashboardFilters.cls

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