Skip to content

Commit ebbf9ac

Browse files
fix URL filter applying (missed controller.contextFilterSpec apply)
1 parent c1b633b commit ebbf9ac

File tree

2 files changed

+13
-1
lines changed

2 files changed

+13
-1
lines changed

export/LightPivotTable-DeepSeePortlet.xml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111

1212
<Class name="DeepSee.LightPivotTable">
1313
<Super>%DeepSee.Component.Portlet.abstractPortlet</Super>
14-
<TimeChanged>63606,42413.124862</TimeChanged>
14+
<TimeChanged>63699,75399.850452</TimeChanged>
1515
<TimeCreated>63515,61322.546099</TimeCreated>
1616

1717
<Parameter name="INCLUDEFILES">
@@ -129,6 +129,9 @@
129129
for (var i in controller.filters) {
130130
this.LightPivotTable.CONFIG["defaultFilterSpecs"].push(controller.filters[i].spec);
131131
}
132+
if (controller.contextFilterSpec) {
133+
this.LightPivotTable.CONFIG["defaultFilterSpecs"].push(controller.contextFilterSpec);
134+
}
132135
133136
this.LightPivotTable.refresh();
134137
@@ -257,6 +260,9 @@
257260
namespace: container.getAttribute("namespace")
258261
}
259262
}
263+
if (controller.contextFilterSpec) {
264+
defaultFilters.push(controller.contextFilterSpec);
265+
}
260266
if (defaultFilters.length) { setup["defaultFilterSpecs"] = defaultFilters; }
261267
if (controller && controller["data"] && controller["data"]["rowCaptions"] && typeof controller["data"]["rowCaptions"][0] === "string") setup.caption = controller["data"]["rowCaptions"][0];
262268
if (controller && controller["data"] && !setup.caption) setup.caption = controller["data"]["defaultCaption"] || "";

source/js/MDXParser.js

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -133,6 +133,12 @@ MDXParser.prototype.mdxType = function (mdx) {
133133
*/
134134
MDXParser.prototype.applyFilter = function (basicMDX, filterSpec) {
135135

136+
var re = /\((([^\),])+,?)+\)/; // gathered filter
137+
138+
if (re.test(filterSpec)) {
139+
return basicMDX + " %FILTER " + filterSpec.substr(1, filterSpec.length-2).split(",").join(" %FILTER ");
140+
}
141+
136142
return basicMDX + " %FILTER " + filterSpec;
137143

138144
};

0 commit comments

Comments
 (0)