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:
authordiosmosis <benaka@piwik.pro>2015-09-15 03:33:59 +0300
committerdiosmosis <benaka@piwik.pro>2015-09-15 11:23:15 +0300
commit237f202c7a4ac7b659855d3078ae5a58c1ee3c65 (patch)
tree64a584d2d01ab2183daeef1ad32194322e6c80a7 /plugins/CustomVariables
parent5c5ec8ae9aecd0bf98597eee0047f0d0cdee2243 (diff)
Refs #6031, #7213, add segment label to top level CustomVariables.getCustomVariables report for customVariableName.
Diffstat (limited to 'plugins/CustomVariables')
-rw-r--r--plugins/CustomVariables/API.php2
-rw-r--r--plugins/CustomVariables/tests/System/expected/test_CustomVariablesSystemTest__CustomVariables.getCustomVariables_day.xml16
2 files changed, 18 insertions, 0 deletions
diff --git a/plugins/CustomVariables/API.php b/plugins/CustomVariables/API.php
index 36d4e1ff9a..fa3a99dbca 100644
--- a/plugins/CustomVariables/API.php
+++ b/plugins/CustomVariables/API.php
@@ -73,6 +73,8 @@ class API extends \Piwik\Plugin\API
if ($flat) {
$dataTable->filterSubtables('Piwik\Plugins\CustomVariables\DataTable\Filter\CustomVariablesValuesFromNameId');
+ } else {
+ $dataTable->filter('AddSegmentByLabel', array('customVariableName'));
}
return $dataTable;
diff --git a/plugins/CustomVariables/tests/System/expected/test_CustomVariablesSystemTest__CustomVariables.getCustomVariables_day.xml b/plugins/CustomVariables/tests/System/expected/test_CustomVariablesSystemTest__CustomVariables.getCustomVariables_day.xml
index 1ecaf61b08..3a5683bdc6 100644
--- a/plugins/CustomVariables/tests/System/expected/test_CustomVariablesSystemTest__CustomVariables.getCustomVariables_day.xml
+++ b/plugins/CustomVariables/tests/System/expected/test_CustomVariablesSystemTest__CustomVariables.getCustomVariables_day.xml
@@ -3,6 +3,7 @@
<row>
<label>Name_PAGE_1</label>
<nb_actions>1</nb_actions>
+ <segment>customVariableName==Name_PAGE_1</segment>
<subtable>
<row>
<label>Val_PAGE1</label>
@@ -14,6 +15,7 @@
<row>
<label>Name_PAGE_2</label>
<nb_actions>1</nb_actions>
+ <segment>customVariableName==Name_PAGE_2</segment>
<subtable>
<row>
<label>Val_PAGE2</label>
@@ -25,6 +27,7 @@
<row>
<label>Name_PAGE_3</label>
<nb_actions>1</nb_actions>
+ <segment>customVariableName==Name_PAGE_3</segment>
<subtable>
<row>
<label>Val_PAGE3</label>
@@ -36,6 +39,7 @@
<row>
<label>Name_PAGE_4</label>
<nb_actions>1</nb_actions>
+ <segment>customVariableName==Name_PAGE_4</segment>
<subtable>
<row>
<label>Val_PAGE4</label>
@@ -47,6 +51,7 @@
<row>
<label>Name_PAGE_5</label>
<nb_actions>1</nb_actions>
+ <segment>customVariableName==Name_PAGE_5</segment>
<subtable>
<row>
<label>Val_PAGE5</label>
@@ -58,6 +63,7 @@
<row>
<label>Name_PAGE_6</label>
<nb_actions>1</nb_actions>
+ <segment>customVariableName==Name_PAGE_6</segment>
<subtable>
<row>
<label>Val_PAGE6</label>
@@ -69,6 +75,7 @@
<row>
<label>Name_PAGE_7</label>
<nb_actions>1</nb_actions>
+ <segment>customVariableName==Name_PAGE_7</segment>
<subtable>
<row>
<label>Val_PAGE7</label>
@@ -80,6 +87,7 @@
<row>
<label>Name_PAGE_8</label>
<nb_actions>1</nb_actions>
+ <segment>customVariableName==Name_PAGE_8</segment>
<subtable>
<row>
<label>Val_PAGE8</label>
@@ -105,6 +113,7 @@
</goals>
<nb_conversions>1</nb_conversions>
<revenue>0</revenue>
+ <segment>customVariableName==Name_VISIT_1</segment>
<subtable>
<row>
<label>Val_VISIT1</label>
@@ -143,6 +152,7 @@
</goals>
<nb_conversions>1</nb_conversions>
<revenue>0</revenue>
+ <segment>customVariableName==Name_VISIT_2</segment>
<subtable>
<row>
<label>Val_VISIT2</label>
@@ -181,6 +191,7 @@
</goals>
<nb_conversions>1</nb_conversions>
<revenue>0</revenue>
+ <segment>customVariableName==Name_VISIT_3</segment>
<subtable>
<row>
<label>Val_VISIT3</label>
@@ -219,6 +230,7 @@
</goals>
<nb_conversions>1</nb_conversions>
<revenue>0</revenue>
+ <segment>customVariableName==Name_VISIT_4</segment>
<subtable>
<row>
<label>Val_VISIT4</label>
@@ -257,6 +269,7 @@
</goals>
<nb_conversions>1</nb_conversions>
<revenue>0</revenue>
+ <segment>customVariableName==Name_VISIT_5</segment>
<subtable>
<row>
<label>Val_VISIT5</label>
@@ -295,6 +308,7 @@
</goals>
<nb_conversions>1</nb_conversions>
<revenue>0</revenue>
+ <segment>customVariableName==Name_VISIT_6</segment>
<subtable>
<row>
<label>Val_VISIT6</label>
@@ -333,6 +347,7 @@
</goals>
<nb_conversions>1</nb_conversions>
<revenue>0</revenue>
+ <segment>customVariableName==Name_VISIT_7</segment>
<subtable>
<row>
<label>Val_VISIT7</label>
@@ -371,6 +386,7 @@
</goals>
<nb_conversions>1</nb_conversions>
<revenue>0</revenue>
+ <segment>customVariableName==Name_VISIT_8</segment>
<subtable>
<row>
<label>Val_VISIT8</label>