Skip to content

Commit c2f5dfd

Browse files
committed
[views] action map should use new way to get URL
1 parent cf0c53d commit c2f5dfd

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

plugins/views/frontend/public/heatmap.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -523,7 +523,7 @@
523523
}
524524

525525
function loadData() {
526-
sendXmlHttpRequest({ app_key: Countly.app_key, view: Countly._internals.getLastView() || window.location.pathname, period: period, device: JSON.stringify(currentDevice[0]), actionType: actionType }, apiPath, function(err, clicks) {
526+
sendXmlHttpRequest({ app_key: Countly.app_key, view: (Countly.getViewUrl) ? Countly.getViewUrl() : Countly._internals.getLastView() || window.location.pathname, period: period, device: JSON.stringify(currentDevice[0]), actionType: actionType }, apiPath, function(err, clicks) {
527527
if (!err) {
528528
dataCache[currentDevice[0].type] = clicks.data;
529529
drawData();
@@ -588,7 +588,7 @@
588588
}
589589

590590
function loadData() {
591-
sendXmlHttpRequest({ app_key: Countly.app_key, view: Countly._internals.getLastView() || window.location.pathname, period: period, device: JSON.stringify(currentDevice[0]), actionType: actionType }, apiPath, function(err, scrolls) {
591+
sendXmlHttpRequest({ app_key: Countly.app_key, view: (Countly.getViewUrl) ? Countly.getViewUrl() : Countly._internals.getLastView() || window.location.pathname, period: period, device: JSON.stringify(currentDevice[0]), actionType: actionType }, apiPath, function(err, scrolls) {
592592
if (!err) {
593593
dataCache[currentDevice[0].type] = scrolls.data;
594594
drawData();

plugins/views/frontend/public/javascripts/countly.views.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -209,7 +209,7 @@ window.ViewsView = countlyView.extend({
209209
self.haveActionColumn = false;
210210
if (typeof addDrill !== "undefined") {
211211
$(".widget-header .left .title").after(addDrill("sg.name", null, "[CLY]_view"));
212-
if (countlyGlobal.apps[countlyCommon.ACTIVE_APP_ID].type === "web" && domains.length) {
212+
if (countlyGlobal.apps[countlyCommon.ACTIVE_APP_ID].type === "web" && (domains.length || countlyGlobal.apps[countlyCommon.ACTIVE_APP_ID].app_domain && countlyGlobal.apps[countlyCommon.ACTIVE_APP_ID].app_domain.length > 0)) {
213213
self.haveActionColumn = true;
214214
columns.push({
215215
"mData": function(row) {

0 commit comments

Comments
 (0)