diff options
| author | Thomas Steur <thomas.steur@gmail.com> | 2016-08-31 16:13:54 +0300 |
|---|---|---|
| committer | Thomas Steur <thomas.steur@gmail.com> | 2016-08-31 16:13:54 +0300 |
| commit | 4617d4205cdf646a52ef1886d9240e9c2bad0609 (patch) | |
| tree | 849ee39219166830170513e6b00161d3e5864514 /plugins/Dashboard | |
| parent | 903b870466b62e8a655a0f6564d052583c0fb7ec (diff) | |
| parent | 5d52b777100f5acb82d16e947e0e9ab2c0804215 (diff) | |
Merge branch '3.x-dev' into 3.0-m06
Conflicts:
js/piwik.min.js
piwik.js
Diffstat (limited to 'plugins/Dashboard')
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') |