diff options
| author | benakamoorthi <benaka.moorthi@gmail.com> | 2012-07-25 18:13:27 +0400 |
|---|---|---|
| committer | benakamoorthi <benaka.moorthi@gmail.com> | 2012-07-25 18:13:27 +0400 |
| commit | 3605ba0212c9bddaef656467c95787c25fc1e599 (patch) | |
| tree | 627e5e8f6c69aa9bc71ad05f0da9c60014bedeaf /plugins/UsersManager | |
| parent | 951c09967a13bff9e48153835a0e2f4077b02b96 (diff) | |
Fixes #3202, allowed site selector widget to be used in other places than the top bar, and put widget to use in 'report to load by default' setting.
git-svn-id: http://dev.piwik.org/svn/trunk@6556 59fd770c-687e-43c8-a1e3-f5a4ff64c105
Diffstat (limited to 'plugins/UsersManager')
| -rw-r--r-- | plugins/UsersManager/Controller.php | 9 | ||||
| -rw-r--r-- | plugins/UsersManager/templates/userSettings.js | 2 | ||||
| -rw-r--r-- | plugins/UsersManager/templates/userSettings.tpl | 13 |
3 files changed, 18 insertions, 6 deletions
diff --git a/plugins/UsersManager/Controller.php b/plugins/UsersManager/Controller.php index 21f174c119..3ff85f537a 100644 --- a/plugins/UsersManager/Controller.php +++ b/plugins/UsersManager/Controller.php @@ -145,6 +145,15 @@ class Piwik_UsersManager_Controller extends Piwik_Controller_Admin $defaultReport = $this->getDefaultWebsiteId(); } $view->defaultReport = $defaultReport; + + if ($defaultReport == 'MultiSites') + { + $view->defaultReportSiteName = Piwik_Site::getNameFor($this->getDefaultWebsiteId()); + } + else + { + $view->defaultReportSiteName = Piwik_Site::getNameFor($defaultReport); + } $view->defaultDate = $this->getDefaultDateForUser($userLogin); $view->availableDefaultDates = array( diff --git a/plugins/UsersManager/templates/userSettings.js b/plugins/UsersManager/templates/userSettings.js index 46c4fa699a..9d91c0a6c7 100644 --- a/plugins/UsersManager/templates/userSettings.js +++ b/plugins/UsersManager/templates/userSettings.js @@ -25,7 +25,7 @@ function getUserSettingsAJAX() var passwordBis = encodeURIComponent( $('#passwordBis').val() ); var defaultReport = $('input[name=defaultReport]:checked').val(); if(defaultReport == 1) { - defaultReport = $('#defaultReportWebsite option:selected').val(); + defaultReport = $('#sitesSelectionSearch .custom_select_main_link').attr('siteid'); } var request = ''; request += 'module=UsersManager'; diff --git a/plugins/UsersManager/templates/userSettings.tpl b/plugins/UsersManager/templates/userSettings.tpl index 4d3c1ab1bb..5a9730f5e8 100644 --- a/plugins/UsersManager/templates/userSettings.tpl +++ b/plugins/UsersManager/templates/userSettings.tpl @@ -41,11 +41,14 @@ <fieldset> <label><input type="radio" value="MultiSites" name="defaultReport"{if $defaultReport=='MultiSites'} checked="checked"{/if} /> {'General_AllWebsitesDashboard'|translate}</label><br /> <label><input type="radio" value="1" name="defaultReport"{if $defaultReport!='MultiSites'} checked="checked"{/if} /> {'General_DashboardForASpecificWebsite'|translate}</label> - <select id="defaultReportWebsite"> - {if isset($sites)}{foreach from=$sites item=info} - <option value="{$info.idsite}" {if $defaultReport==$info.idsite} selected="selected"{/if}>{$info.name}</option> - {/foreach}{/if} - </select> + {assign var=siteName value="$defaultReportSiteName"} + {include file="CoreHome/templates/sites_selection.tpl"} + {literal} + <script type="text/javascript"> + // make sure nothing happens when an item is selected + window.autocompleteOnNewSiteSelect = function() {}; + </script> + {/literal} </fieldset> </td> </tr> |