diff options
author | diosmosis <diosmosis@users.noreply.github.com> | 2020-04-19 23:10:43 +0300 |
---|---|---|
committer | diosmosis <diosmosis@users.noreply.github.com> | 2020-04-19 23:10:43 +0300 |
commit | 7ae8dc6609379b20ae6db5ccc6bb04603ccde16c (patch) | |
tree | f6e59e27126f2f93b9fb6a8e03924b61316ab103 /plugins/UserId | |
parent | 7e6b13cfd9207adfd2ab0e3d39d0d3b8b17bb3ea (diff) | |
parent | 9b359e1525ccf65013376cf75b5eb406d29b5f4b (diff) |
Merge branch '3.x-dev' into 3.x-4.x-2
Diffstat (limited to 'plugins/UserId')
9 files changed, 19 insertions, 0 deletions
diff --git a/plugins/UserId/API.php b/plugins/UserId/API.php index a76d6ee7cf..fd5a7607f1 100644 --- a/plugins/UserId/API.php +++ b/plugins/UserId/API.php @@ -40,6 +40,7 @@ class API extends \Piwik\Plugin\API $dataTable->queueFilter('ReplaceColumnNames'); $dataTable->queueFilter('ReplaceSummaryRowLabel'); + $dataTable->queueFilter('AddSegmentByLabel', array('userId')); return $dataTable; } diff --git a/plugins/UserId/tests/System/expected/test___UserId.getUsers_day.xml b/plugins/UserId/tests/System/expected/test___UserId.getUsers_day.xml index 5ef64951ca..76eef7b786 100644 --- a/plugins/UserId/tests/System/expected/test___UserId.getUsers_day.xml +++ b/plugins/UserId/tests/System/expected/test___UserId.getUsers_day.xml @@ -11,6 +11,7 @@ <bounce_count>1</bounce_count> <nb_visits_converted>0</nb_visits_converted> + <segment>userId==user1</segment> </row> <row> <label>user2</label> @@ -23,6 +24,7 @@ <bounce_count>1</bounce_count> <nb_visits_converted>0</nb_visits_converted> + <segment>userId==user2</segment> </row> <row> <label>user3</label> @@ -35,5 +37,6 @@ <bounce_count>1</bounce_count> <nb_visits_converted>0</nb_visits_converted> + <segment>userId==user3</segment> </row> </result>
\ No newline at end of file diff --git a/plugins/UserId/tests/System/expected/test___UserId.getUsers_range.xml b/plugins/UserId/tests/System/expected/test___UserId.getUsers_range.xml index 9ea8701a8b..fc8e450e2e 100644 --- a/plugins/UserId/tests/System/expected/test___UserId.getUsers_range.xml +++ b/plugins/UserId/tests/System/expected/test___UserId.getUsers_range.xml @@ -11,6 +11,7 @@ <sum_daily_nb_uniq_visitors>30</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>30</sum_daily_nb_users> + <segment>userId==user3</segment> </row> <row> <label>user2</label> @@ -23,6 +24,7 @@ <sum_daily_nb_uniq_visitors>20</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>20</sum_daily_nb_users> + <segment>userId==user2</segment> </row> <row> <label>user1</label> @@ -35,5 +37,6 @@ <sum_daily_nb_uniq_visitors>10</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>10</sum_daily_nb_users> + <segment>userId==user1</segment> </row> </result>
\ No newline at end of file diff --git a/plugins/UserId/tests/System/expected/test_ascSortOrder__UserId.getUsers_day.xml b/plugins/UserId/tests/System/expected/test_ascSortOrder__UserId.getUsers_day.xml index 8c564d45eb..c501a92a17 100644 --- a/plugins/UserId/tests/System/expected/test_ascSortOrder__UserId.getUsers_day.xml +++ b/plugins/UserId/tests/System/expected/test_ascSortOrder__UserId.getUsers_day.xml @@ -11,6 +11,7 @@ <bounce_count>1</bounce_count> <nb_visits_converted>0</nb_visits_converted> + <segment>userId==user3</segment> </row> <row> <label>user2</label> @@ -23,6 +24,7 @@ <bounce_count>1</bounce_count> <nb_visits_converted>0</nb_visits_converted> + <segment>userId==user2</segment> </row> <row> <label>user1</label> @@ -35,5 +37,6 @@ <bounce_count>1</bounce_count> <nb_visits_converted>0</nb_visits_converted> + <segment>userId==user1</segment> </row> </result>
\ No newline at end of file diff --git a/plugins/UserId/tests/System/expected/test_ascSortOrder__UserId.getUsers_range.xml b/plugins/UserId/tests/System/expected/test_ascSortOrder__UserId.getUsers_range.xml index 15683a3709..4c4facb17c 100644 --- a/plugins/UserId/tests/System/expected/test_ascSortOrder__UserId.getUsers_range.xml +++ b/plugins/UserId/tests/System/expected/test_ascSortOrder__UserId.getUsers_range.xml @@ -11,6 +11,7 @@ <sum_daily_nb_uniq_visitors>10</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>10</sum_daily_nb_users> + <segment>userId==user1</segment> </row> <row> <label>user2</label> @@ -23,6 +24,7 @@ <sum_daily_nb_uniq_visitors>20</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>20</sum_daily_nb_users> + <segment>userId==user2</segment> </row> <row> <label>user3</label> @@ -35,5 +37,6 @@ <sum_daily_nb_uniq_visitors>30</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>30</sum_daily_nb_users> + <segment>userId==user3</segment> </row> </result>
\ No newline at end of file diff --git a/plugins/UserId/tests/System/expected/test_limit__UserId.getUsers_day.xml b/plugins/UserId/tests/System/expected/test_limit__UserId.getUsers_day.xml index df266da1fa..663e10d76b 100644 --- a/plugins/UserId/tests/System/expected/test_limit__UserId.getUsers_day.xml +++ b/plugins/UserId/tests/System/expected/test_limit__UserId.getUsers_day.xml @@ -11,6 +11,7 @@ <bounce_count>1</bounce_count> <nb_visits_converted>0</nb_visits_converted> + <segment>userId==user2</segment> </row> <row> <label>user3</label> @@ -23,5 +24,6 @@ <bounce_count>1</bounce_count> <nb_visits_converted>0</nb_visits_converted> + <segment>userId==user3</segment> </row> </result>
\ No newline at end of file diff --git a/plugins/UserId/tests/System/expected/test_limit__UserId.getUsers_range.xml b/plugins/UserId/tests/System/expected/test_limit__UserId.getUsers_range.xml index 81fc70ff6f..0ebc46bfd4 100644 --- a/plugins/UserId/tests/System/expected/test_limit__UserId.getUsers_range.xml +++ b/plugins/UserId/tests/System/expected/test_limit__UserId.getUsers_range.xml @@ -11,6 +11,7 @@ <sum_daily_nb_uniq_visitors>20</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>20</sum_daily_nb_users> + <segment>userId==user2</segment> </row> <row> <label>user1</label> @@ -23,5 +24,6 @@ <sum_daily_nb_uniq_visitors>10</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>10</sum_daily_nb_users> + <segment>userId==user1</segment> </row> </result>
\ No newline at end of file diff --git a/plugins/UserId/tests/System/expected/test_searchByUserId__UserId.getUsers_day.xml b/plugins/UserId/tests/System/expected/test_searchByUserId__UserId.getUsers_day.xml index f0596f12ca..e65c3830df 100644 --- a/plugins/UserId/tests/System/expected/test_searchByUserId__UserId.getUsers_day.xml +++ b/plugins/UserId/tests/System/expected/test_searchByUserId__UserId.getUsers_day.xml @@ -11,5 +11,6 @@ <bounce_count>1</bounce_count> <nb_visits_converted>0</nb_visits_converted> + <segment>userId==user2</segment> </row> </result>
\ No newline at end of file diff --git a/plugins/UserId/tests/System/expected/test_searchByUserId__UserId.getUsers_range.xml b/plugins/UserId/tests/System/expected/test_searchByUserId__UserId.getUsers_range.xml index dff804011e..14cd163444 100644 --- a/plugins/UserId/tests/System/expected/test_searchByUserId__UserId.getUsers_range.xml +++ b/plugins/UserId/tests/System/expected/test_searchByUserId__UserId.getUsers_range.xml @@ -11,5 +11,6 @@ <sum_daily_nb_uniq_visitors>20</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>20</sum_daily_nb_users> + <segment>userId==user2</segment> </row> </result>
\ No newline at end of file |