diff options
| author | Thomas Steur <thomas.steur@gmail.com> | 2016-04-06 06:29:18 +0300 |
|---|---|---|
| committer | Thomas Steur <thomas.steur@gmail.com> | 2016-04-06 06:29:18 +0300 |
| commit | 3eb0cf055146c0b77b592cf9ef4bf2eb2e2f1ca3 (patch) | |
| tree | 99817781db0a0626fa4d14f96697f6e04e66f983 /plugins/Transitions | |
| parent | 1854f5c456a76af807431d52bcb19ad207ba658e (diff) | |
| parent | 0f38083969261b95a00c59f1f5596d35365506cd (diff) | |
Merge branch 'master' into 3.0-m03
Conflicts:
core/Version.php
core/WidgetsList.php
plugins/CustomDimensions
plugins/Goals/templates/getGoalReportView.twig
plugins/Goals/templates/getOverviewView.twig
tests/UI/expected-ui-screenshots
Diffstat (limited to 'plugins/Transitions')
| -rw-r--r-- | plugins/Transitions/API.php | 6 | ||||
| -rw-r--r-- | plugins/Transitions/lang/fi.json | 1 |
2 files changed, 5 insertions, 2 deletions
diff --git a/plugins/Transitions/API.php b/plugins/Transitions/API.php index 1ab38f89ae..4304e2a281 100644 --- a/plugins/Transitions/API.php +++ b/plugins/Transitions/API.php @@ -222,7 +222,8 @@ class API extends \Piwik\Plugin\API if ($actionType != 'title') { // specific setup for page urls $types[Action::TYPE_PAGE_URL] = 'followingPages'; - $dimension = 'if ( idaction_url IS NULL, idaction_name, idaction_url )'; + $dimension = 'if ( %1$s.idaction_url IS NULL, %1$s.idaction_name, %1$s.idaction_url )'; + $dimension = sprintf($dimension, 'log_link_visit_action' ); // site search referrers are logged with url=NULL // when we find one, we have to join on name $joinLogActionColumn = $dimension; @@ -405,7 +406,8 @@ class API extends \Piwik\Plugin\API if ($dimension == 'idaction_url_ref') { // site search referrers are logged with url_ref=NULL // when we find one, we have to join on name_ref - $dimension = 'if ( idaction_url_ref IS NULL, idaction_name_ref, idaction_url_ref )'; + $dimension = 'if ( %1$s.idaction_url_ref IS NULL, %1$s.idaction_name_ref, %1$s.idaction_url_ref )'; + $dimension = sprintf($dimension, 'log_link_visit_action'); $joinLogActionOn = $dimension; } else { $joinLogActionOn = $dimension; diff --git a/plugins/Transitions/lang/fi.json b/plugins/Transitions/lang/fi.json index 246303c4df..df5c6bc3a8 100644 --- a/plugins/Transitions/lang/fi.json +++ b/plugins/Transitions/lang/fi.json @@ -16,6 +16,7 @@ "NoDataForAction": "%s:lle ei ole tietoja", "NoDataForActionDetails": "Joko toiminnolle ei ole tietoja aikavälille %s tai toiminto on virheellinen.", "OutgoingTraffic": "Lähtevä liikenne", + "PluginDescription": "Raportoi edellisen ja seuraavat toiminnot jokaiselle sivulle. Saatavilla \"Toiminnot\"-raportissa uuden ikonin takaa.", "ShareOfAllPageviews": "Tällä sivulla on %1$s sivunavausta (%2$s kaikista)", "ToFollowingPages": "Sisäisille sivuille", "ToFollowingPagesInline": "%s sisäisille sivuille", |