From ca6b7e77f4d4b886db0d0660db1f0ae6980e3fe4 Mon Sep 17 00:00:00 2001 From: diosmosis <benaka@piwik.pro> Date: Mon, 14 Sep 2015 16:39:25 -0700 Subject: [PATCH] Add visit scope text to relevant custom variable segments. --- plugins/CustomVariables/Columns/Base.php | 2 +- .../test_apiGetReportMetadata__API.getSegmentsMetadata.xml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/plugins/CustomVariables/Columns/Base.php b/plugins/CustomVariables/Columns/Base.php index 189475b34c..1818ca3145 100644 --- a/plugins/CustomVariables/Columns/Base.php +++ b/plugins/CustomVariables/Columns/Base.php @@ -23,7 +23,7 @@ class Base extends VisitDimension $segment = new Segment(); $segment->setType('dimension'); $segment->setSegment('customVariable' . $segmentNameSuffix); - $segment->setName($this->getName()); + $segment->setName($this->getName() . ' (' . Piwik::translate('CustomVariables_ScopeVisit') . ')'); $segment->setCategory('CustomVariables_CustomVariables'); $segment->setSqlSegment($this->getSegmentColumns('log_visit.' . $fieldPrefix, $numCustomVariables)); $segment->setSuggestedValuesCallback(function ($idSite, $ignore, DataTable $table) use ($segmentNameSuffix) { diff --git a/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getSegmentsMetadata.xml b/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getSegmentsMetadata.xml index d9bc99c496..5d8a3f505e 100644 --- a/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getSegmentsMetadata.xml +++ b/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getSegmentsMetadata.xml @@ -279,7 +279,7 @@ <row> <type>dimension</type> <category>Custom Variables</category> - <name>Custom Variable name</name> + <name>Custom Variable name (scope visit)</name> <segment>customVariableName</segment> </row> <row> @@ -387,7 +387,7 @@ <row> <type>dimension</type> <category>Custom Variables</category> - <name>Custom Variable value</name> + <name>Custom Variable value (scope visit)</name> <segment>customVariableValue</segment> </row> <row> -- GitLab