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:
authormattab <matthieu.aubry@gmail.com>2016-12-01 04:09:31 +0300
committermattab <matthieu.aubry@gmail.com>2016-12-01 04:09:31 +0300
commit716b64d4b1fe5dd6fbf8c8d11000baff33b1a83c (patch)
tree99ea896dd0cd6e0783e012ea248a927330b724e4 /plugins/CoreAdminHome
parentc476dcaf576aca472509374cc7433d42e7cc61b3 (diff)
Fix issue with tracking custom variables checkbox
Diffstat (limited to 'plugins/CoreAdminHome')
-rw-r--r--plugins/CoreAdminHome/angularjs/trackingcode/jstrackingcode.controller.js2
-rw-r--r--plugins/CoreAdminHome/templates/trackingCodeGenerator.twig1
2 files changed, 1 insertions, 2 deletions
diff --git a/plugins/CoreAdminHome/angularjs/trackingcode/jstrackingcode.controller.js b/plugins/CoreAdminHome/angularjs/trackingcode/jstrackingcode.controller.js
index df6befaec8..3758175751 100644
--- a/plugins/CoreAdminHome/angularjs/trackingcode/jstrackingcode.controller.js
+++ b/plugins/CoreAdminHome/angularjs/trackingcode/jstrackingcode.controller.js
@@ -80,7 +80,7 @@
groupPageTitlesByDomain: self.groupByDomain ? 1 : 0,
mergeSubdomains: self.trackAllSubdomains ? 1 : 0,
mergeAliasUrls: self.trackAllAliases ? 1 : 0,
- visitorCustomVariables: getCustomVariables(self.customVars),
+ visitorCustomVariables: self.trackCustomVars ? getCustomVariables(self.customVars) : 0,
customCampaignNameQueryParam: null,
customCampaignKeywordParam: null,
doNotTrack: self.doNotTrack ? 1 : 0,
diff --git a/plugins/CoreAdminHome/templates/trackingCodeGenerator.twig b/plugins/CoreAdminHome/templates/trackingCodeGenerator.twig
index 4d096b3565..64362a7bb2 100644
--- a/plugins/CoreAdminHome/templates/trackingCodeGenerator.twig
+++ b/plugins/CoreAdminHome/templates/trackingCodeGenerator.twig
@@ -103,7 +103,6 @@
{# visitor custom variable #}
<div piwik-field uicontrol="checkbox" name="javascript-tracking-visitor-cv-check"
- class="section-toggler-link"
ng-model="jsTrackingCode.trackCustomVars"
ng-change="jsTrackingCode.updateTrackingCode()"
disabled="jsTrackingCode.isLoading"