refs #9375 show only websites having at least admin access in users m…

…anager
matomo-org · Dec 10, 2015 · 370063f · 370063f
1 parent c40d440
commit 370063f
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 3 deletions.
diff --git a/plugins/CoreHome/angularjs/siteselector/siteselector-model.service.js b/plugins/CoreHome/angularjs/siteselector/siteselector-model.service.js
@@ -19,6 +19,7 @@
             hasMultipleWebsites : false,
             isLoading : false,
             firstSiteName : '',
+            onlySitesWithAdminAccess: false,
             updateWebsitesList: updateWebsitesList,
             searchSite: searchSite,
             loadSite: loadSite,
@@ -81,8 +82,13 @@
             return limitPromise.then(function (response) {
                 var limit = response.value;
 
+                var methodToCall = 'SitesManager.getPatternMatchSites';
+                if (model.onlySitesWithAdminAccess) {
+                    methodToCall = 'SitesManager.getSitesWithAdminAccess';
+                }
+
                 model.currentRequest = piwikApi.fetch({
-                    method: 'SitesManager.getPatternMatchSites',
+                    method: methodToCall,
                     limit: limit,
                     pattern: term
                 });

diff --git a/plugins/CoreHome/angularjs/siteselector/siteselector.directive.js b/plugins/CoreHome/angularjs/siteselector/siteselector.directive.js
@@ -13,7 +13,7 @@
  * <div piwik-siteselector
  *      show-selected-site="true" show-all-sites-item="true" switch-site-on-select="true"
  *      all-sites-location="top|bottom" all-sites-text="test" show-selected-site="true"
- *      show-all-sites-item="true">
+ *      show-all-sites-item="true" only-sites-with-admin-access="true">
  *
  * Within a form
  * <div piwik-siteselector input-name="siteId">
@@ -37,7 +37,8 @@
             allSitesText: $filter('translate')('General_MultiSitesSummary'),
             showSelectedSite: 'false',
             showAllSitesItem: 'true',
-            switchSiteOnSelect: 'true'
+            switchSiteOnSelect: 'true',
+            onlySitesWithAdminAccess: 'false'
         };
 
         return {
@@ -46,6 +47,7 @@
                 showSelectedSite: '=',
                 showAllSitesItem: '=',
                 switchSiteOnSelect: '=',
+                onlySitesWithAdminAccess: '=',
                 inputName: '@name',
                 allSitesText: '@',
                 allSitesLocation: '@'
@@ -63,6 +65,7 @@
 
                 return function (scope, element, attrs, ngModel) {
                     scope.selectedSite = {id: attrs.siteid, name: attrs.sitename};
+                    scope.model.onlySitesWithAdminAccess = scope.onlySitesWithAdminAccess;
                     scope.model.loadInitialSites();
 
                     if (ngModel) {

diff --git a/plugins/UsersManager/templates/index.twig b/plugins/UsersManager/templates/index.twig
@@ -16,6 +16,7 @@
 
         <div piwik-siteselector
              show-selected-site="true"
+             only-sites-with-admin-access="true"
              class="sites_autocomplete"
              siteid="{{ idSiteSelected }}"
              sitename="{{ defaultReportSiteName }}"