diff options
| author | Ben Burgess <88810029+bx80@users.noreply.github.com> | 2021-11-19 14:04:41 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-11-19 14:04:41 +0300 |
| commit | 45d8528596500769ae2587b780cb43b5f7f303dd (patch) | |
| tree | 82b8678f6f5c33db225e0a607b7b2c4ee49846f0 | |
| parent | b426c7b71aca9a4f77d6e676f1bd5fb9decbd5b0 (diff) | |
Removed multisite piwik_url usage in favour of relative Urls (#18345)
| -rw-r--r-- | plugins/MultiSites/angularjs/dashboard/dashboard.directive.html | 2 | ||||
| -rw-r--r-- | plugins/MultiSites/angularjs/site/site.controller.js | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/plugins/MultiSites/angularjs/dashboard/dashboard.directive.html b/plugins/MultiSites/angularjs/dashboard/dashboard.directive.html index ee973caa50..b51ff7048c 100644 --- a/plugins/MultiSites/angularjs/dashboard/dashboard.directive.html +++ b/plugins/MultiSites/angularjs/dashboard/dashboard.directive.html @@ -89,7 +89,7 @@ <td colspan="8" class="paging" ng-hide="model.numberOfPages() <= 1"> <div class="row"> <div class="col s3 add_new_site"> - <a ng-if="hasSuperUserAccess" href="{{ url }}?module=SitesManager&action=index&showaddsite=1&period={{ period }}&date={{ date }}&idSite={{ idSite }}"> + <a ng-if="hasSuperUserAccess" href="index.php?module=SitesManager&action=index&showaddsite=1&period={{ period }}&date={{ date }}&idSite={{ idSite }}"> <span class="icon-add"></span> {{ 'SitesManager_AddSite'|translate }} </a> </div> diff --git a/plugins/MultiSites/angularjs/site/site.controller.js b/plugins/MultiSites/angularjs/site/site.controller.js index cd4b270788..9237ec25a3 100644 --- a/plugins/MultiSites/angularjs/site/site.controller.js +++ b/plugins/MultiSites/angularjs/site/site.controller.js @@ -27,7 +27,7 @@ } function dashboardUrl(website){ - return piwik.piwik_url + 'index.php?module=CoreHome&action=index&date=' + $scope.date + '&period=' + $scope.period + '&idSite=' + website.idsite + tokenParam(); + return 'index.php?module=CoreHome&action=index&date=' + $scope.date + '&period=' + $scope.period + '&idSite=' + website.idsite + tokenParam(); } function sparklineImage(website){ @@ -45,7 +45,7 @@ break; } - return piwik.piwik_url + 'index.php?module=MultiSites&action=getEvolutionGraph&period=' + $scope.period + '&date=' + $scope.dateSparkline + '&evolutionBy=' + metric + '&columns=' + metric + '&idSite=' + website.idsite + '&idsite=' + website.idsite + '&viewDataTable=sparkline' + tokenParam() + '&colors=' + encodeURIComponent(JSON.stringify(piwik.getSparklineColors())); + return 'index.php?module=MultiSites&action=getEvolutionGraph&period=' + $scope.period + '&date=' + $scope.dateSparkline + '&evolutionBy=' + metric + '&columns=' + metric + '&idSite=' + website.idsite + '&idsite=' + website.idsite + '&viewDataTable=sparkline' + tokenParam() + '&colors=' + encodeURIComponent(JSON.stringify(piwik.getSparklineColors())); } } })(); |