Filters processing

export/LightPivotTable-DeepSeePortlet.xml

@@ -182,12 +182,12 @@
         defaultFilters = [],
         exportToExcel = !!parseInt(container.getAttribute("export-csv"));
 
-    // !ultra-bydlocode (get the widget object)
-    while (widget["parent"]) {
+    // Following "parent" until we find widget object
+    while (!widget["widgetKey"]) {
         widget = widget["parent"];
     }
-    // !ultra-bydlocode (possible you will have better suggestions to get widget key)
-    widgetKey = parseInt(_.parent.parent.onwindowgrab.match(/[0-9]+/)[0]);
+
+    widgetKey = widget["widgetKey"];
 
     if (exportToExcel) {
         var widgetHead = document.getElementById(basicContainer.getAttribute("id").replace(/\/.*/, "/header"));
@@ -233,7 +233,7 @@
         (source = location.origin + "/" + container.getAttribute("data-source"))
         + "/Widgets?Namespace=" + container.getAttribute("namespace"),
         {
-            Dashboard: widget["dashboardName"]
+            Dashboard: zenPage["dashboardName"]
         },
         function (data) {
             if (data.error) {
@@ -246,16 +246,6 @@
                     }
                 }
                 //console.log(info);
-                if (info.controls instanceof Array) {
-                    for (i in info.controls) {
-                        if ((info.controls[i].action === "applyFilter" || info.controls[i].action === "setFilter") && info.controls[i].value) {
-                            if ((filterValue = info.controls[i].value).charAt(0) === "%" && filterValue.indexOf(" ") > 1) {
-                                filterValue = filterValue.split(" ")[1] + "." + filterValue.split(" ")[0]
-                            }
-                            defaultFilters.push(info.controls[i].targetProperty + "." + filterValue);
-                        }
-                    }
-                }
                 setup = {
                     container: container,
                     dataSource: {
@@ -272,6 +262,21 @@
                         }
                     }
                 }
+                // Getting filters from controller, if it has filters added from URL or default...
+                // such filters are marked as "transient"
+                if (controller.filters.length) {
+                    for (i in controller.filters) {
+                        if (controller.filters[i].enabled && controller.filters[i].transient)
+                            defaultFilters.push(controller.filters[i].spec);
+                    }
+                }
+                // ... if not, we'll get filters from widget's controls
+                // Only if the controller didn't have transient filters - (!defaultFilters.length)
+                if (!defaultFilters.length && widget.filterState instanceof Object) {
+                    for (i in widget.filterState)
+                        if (widget.filterState[i]) defaultFilters.push(widget.constructMDXClause(i,widget.filterState[i]));
+                }
+
                 if (controller.contextFilterSpec) {
                     defaultFilters.push(controller.contextFilterSpec);
                 }

source/js/PivotView.js

@@ -801,7 +801,7 @@ PivotView.prototype.renderRawData = function (data) {
     );
 
     var formatContent = function (value, element, format) {
-        if (!isFinite(value)) { // not number, format as string
+        if (typeof(value) === 'string') { // not number, format as string
             element.className += " formatLeft";
             element.innerHTML = (value || "").replace(/(https?|ftp):\/\/[^\s]+/ig, function linkReplace (p) {
                 return "<a href='" + p