Skip to content

Commit 797992b

Browse files
LPT won't parse source default filters through MDX2JSON includes them
1 parent ab17465 commit 797992b

File tree

2 files changed

+20
-15
lines changed

2 files changed

+20
-15
lines changed

export/LightPivotTable-DeepSeePortlet.xml

Lines changed: 2 additions & 2 deletions
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>63566,64055.555603</TimeChanged>
14+
<TimeChanged>63566,64710.965337</TimeChanged>
1515
<TimeCreated>63515,61322.546099</TimeCreated>
1616

1717
<Parameter name="INCLUDEFILES">
@@ -214,7 +214,7 @@
214214
dataSource: {
215215
pivot: info["dataSource"],
216216
MDX2JSONSource: source,
217-
basicMDX: info["basemdx"] || info["mdx"]
217+
basicMDX: info["mdx"]
218218
}
219219
}
220220
if (defaultFilters.length) { setup["defaultFilterSpecs"] = defaultFilters; }

source/js/DataSource.js

Lines changed: 18 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,11 @@ var DataSource = function (config, globalConfig, lpt) {
2929

3030
this.FILTERS = [];
3131

32+
/**
33+
* @type {Array}
34+
* @private
35+
* @deprecated
36+
*/
3237
this._PIVOT_DEFAULT_FILTERS = [];
3338

3439
};
@@ -137,7 +142,7 @@ DataSource.prototype.getCurrentData = function (callback) {
137142
var data = ready.pivotData;
138143

139144
_.GLOBAL_CONFIG["pivotProperties"] = ready.pivotData;
140-
_._PIVOT_DEFAULT_FILTERS = [];
145+
//_._PIVOT_DEFAULT_FILTERS = [];
141146

142147
if (data["rowAxisOptions"]) {
143148
if (data["rowAxisOptions"]["drilldownSpec"]) {
@@ -155,13 +160,13 @@ DataSource.prototype.getCurrentData = function (callback) {
155160
}
156161
}
157162

158-
if (data["filters"] && data["filters"].length > 0) {
159-
for (var i in data["filters"]) {
160-
if (data["filters"][i]["spec"]) {
161-
_._PIVOT_DEFAULT_FILTERS.push(data["filters"][i]["spec"]);
162-
}
163-
}
164-
}
163+
//if (data["filters"] && data["filters"].length > 0) {
164+
// for (var i in data["filters"]) {
165+
// if (data["filters"][i]["spec"]) {
166+
// _._PIVOT_DEFAULT_FILTERS.push(data["filters"][i]["spec"]);
167+
// }
168+
// }
169+
//}
165170

166171
};
167172

@@ -219,11 +224,11 @@ DataSource.prototype.getCurrentData = function (callback) {
219224

220225
var requestData = function () {
221226

222-
var filters = _._PIVOT_DEFAULT_FILTERS.concat(_.FILTERS);
223-
224-
for (var i in filters) {
225-
mdx = mdxParser.applyFilter(mdx, filters[i]);
226-
}
227+
//var filters = _._PIVOT_DEFAULT_FILTERS.concat(_.FILTERS);
228+
//
229+
//for (var i in filters) {
230+
// mdx = mdxParser.applyFilter(mdx, filters[i]);
231+
//}
227232

228233
console.log("LPT MDX request:", mdx);
229234

0 commit comments

Comments
 (0)