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:
authorThomas Steur <tsteur@users.noreply.github.com>2016-08-31 01:42:59 +0300
committerThomas Steur <thomas.steur@gmail.com>2016-08-31 16:10:56 +0300
commit73c06026a39a8ba62f83f7082e744480bcc6b86e (patch)
tree5d73cb67c8b1cc584cf28d3bfd31e7cc68b7a6dd /plugins/Dashboard
parentd036bacec1f9b121c9d4f9e5b98ea224ed4dfae0 (diff)
Apply default filter_limit to all API calls (#10009)
* fix #8458 Apply default filter_limit to all API calls * return all results where needed instead of default filter limit of 100 * make sure to apply offset * fix unit tests * fix import logs test as they post the filter value
Diffstat (limited to 'plugins/Dashboard')
-rw-r--r--plugins/Dashboard/angularjs/common/services/dashboards-model.js2
-rw-r--r--plugins/Dashboard/javascripts/dashboard.js3
-rw-r--r--plugins/Dashboard/javascripts/dashboardObject.js3
-rw-r--r--plugins/Dashboard/javascripts/widgetMenu.js1
4 files changed, 6 insertions, 3 deletions
diff --git a/plugins/Dashboard/angularjs/common/services/dashboards-model.js b/plugins/Dashboard/angularjs/common/services/dashboards-model.js
index 8cdfbec772..df2e147fa1 100644
--- a/plugins/Dashboard/angularjs/common/services/dashboards-model.js
+++ b/plugins/Dashboard/angularjs/common/services/dashboards-model.js
@@ -55,7 +55,7 @@
function getAllDashboards()
{
if (!dashboardsPromise) {
- dashboardsPromise = piwikApi.fetch({method: 'Dashboard.getDashboards'}).then(function (response) {
+ dashboardsPromise = piwikApi.fetch({method: 'Dashboard.getDashboards', filter_limit: '-1'}).then(function (response) {
if (response) {
model.dashboards = response;
}
diff --git a/plugins/Dashboard/javascripts/dashboard.js b/plugins/Dashboard/javascripts/dashboard.js
index 48c3430824..27ef28dfa0 100644
--- a/plugins/Dashboard/javascripts/dashboard.js
+++ b/plugins/Dashboard/javascripts/dashboard.js
@@ -99,7 +99,8 @@ function copyDashboardToUser() {
ajaxRequest.addParams({
module: 'API',
method: 'UsersManager.getUsers',
- format: 'json'
+ format: 'json',
+ filter_limit: '-1'
}, 'get');
ajaxRequest.setCallback(
function (availableUsers) {
diff --git a/plugins/Dashboard/javascripts/dashboardObject.js b/plugins/Dashboard/javascripts/dashboardObject.js
index 13862ecd5b..4165bfcaec 100644
--- a/plugins/Dashboard/javascripts/dashboardObject.js
+++ b/plugins/Dashboard/javascripts/dashboardObject.js
@@ -585,7 +585,8 @@
var ajaxRequest = new ajaxHelper();
ajaxRequest.addParams({
module: 'Dashboard',
- action: 'getAllDashboards'
+ action: 'getAllDashboards',
+ filter_limit: '-1'
}, 'get');
ajaxRequest.withTokenInUrl();
ajaxRequest.setCallback(success);
diff --git a/plugins/Dashboard/javascripts/widgetMenu.js b/plugins/Dashboard/javascripts/widgetMenu.js
index 100674ce00..d3d96569eb 100644
--- a/plugins/Dashboard/javascripts/widgetMenu.js
+++ b/plugins/Dashboard/javascripts/widgetMenu.js
@@ -69,6 +69,7 @@ widgetsHelper.getAvailableWidgets = function (callback) {
ajaxRequest.addParams({
module: 'API',
method: 'API.getWidgetMetadata',
+ filter_limit: '-1',
format: 'JSON',
deep: '1',
idSite: piwik.idSite || broadcast.getValueFromUrl('idSite')