Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/matomo-org/matomo.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Giehl <stefan@piwik.org>2017-05-09 10:55:15 +0300
committerMatthieu Aubry <mattab@users.noreply.github.com>2017-05-09 10:55:15 +0300
commitdefc5469a5d4634d64023477a447a31c58812a12 (patch)
tree0636caff6c4ad915700688e80f6c3cde0c0355e1 /plugins/Dashboard/angularjs
parent292b4bd83e0128a2a1802fc5b34d3c1d6f2eeb53 (diff)
Prevent removing page content when opening rowaction in widgetize mode (#11644)
* prevent removing page content when opening rowaction in widgetize mode * adds test to show rowevolution in widgetized dashboard * init only in widgetize mode * fix ui test * fix ui test
Diffstat (limited to 'plugins/Dashboard/angularjs')
-rw-r--r--plugins/Dashboard/angularjs/dashboard/dashboard.directive.js3
1 files changed, 2 insertions, 1 deletions
diff --git a/plugins/Dashboard/angularjs/dashboard/dashboard.directive.js b/plugins/Dashboard/angularjs/dashboard/dashboard.directive.js
index 3231d60a52..04c1a8e6a5 100644
--- a/plugins/Dashboard/angularjs/dashboard/dashboard.directive.js
+++ b/plugins/Dashboard/angularjs/dashboard/dashboard.directive.js
@@ -93,7 +93,8 @@
function onLocationChange(event, newUrl, oldUrl)
{
- if (newUrl !== oldUrl && newUrl.indexOf('category=Dashboard_Dashboard') === -1) {
+ if (broadcast.getValueFromUrl('module') != 'Widgetize' && newUrl !== oldUrl &&
+ newUrl.indexOf('category=Dashboard_Dashboard') === -1) {
// we remove the dashboard only if we no longer show a dashboard.
clearDashboard();
}