diff options
author | robocoder <anthon.pang@gmail.com> | 2010-08-15 05:22:27 +0400 |
---|---|---|
committer | robocoder <anthon.pang@gmail.com> | 2010-08-15 05:22:27 +0400 |
commit | 569b9e83d06b23533c0152b1adcfa0c1a0e0cb48 (patch) | |
tree | b7257519a5798d14eaafb0a95f6dc1677c7a7fcb /plugins/UsersManager | |
parent | 2d97d23d99e15b2f9c5bb8bd70f2c1eab038caec (diff) |
refs #1544, fixes #1591
git-svn-id: http://dev.piwik.org/svn/trunk@2936 59fd770c-687e-43c8-a1e3-f5a4ff64c105
Diffstat (limited to 'plugins/UsersManager')
-rw-r--r-- | plugins/UsersManager/templates/userSettings.js | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/plugins/UsersManager/templates/userSettings.js b/plugins/UsersManager/templates/userSettings.js index 70623f0ecf..fe26323595 100644 --- a/plugins/UsersManager/templates/userSettings.js +++ b/plugins/UsersManager/templates/userSettings.js @@ -1,6 +1,14 @@ function getUserSettingsAJAX() { - var ajaxRequest = piwikHelper.getStandardAjaxConf('ajaxLoadingUserSettings', 'ajaxErrorUserSettings'); + var params; + var defaultDate = $('input[name=defaultDate]:checked').val(); + if(defaultDate == 'today' || defaultDate == 'yesterday') { + params = 'period=day&date='+defaultDate; + } else { + params = 'date=today&period='+defaultDate; + } + + var ajaxRequest = piwikHelper.getStandardAjaxConf('ajaxLoadingUserSettings', 'ajaxErrorUserSettings', params); var alias = $('#alias').val(); var email = $('#email').val(); var password = $('#password').val(); @@ -9,7 +17,6 @@ function getUserSettingsAJAX() if(defaultReport == 1) { defaultReport = $('#defaultReportWebsite option:selected').val(); } - var defaultDate = $('input[name=defaultDate]:checked').val(); var request = ''; request += 'module=UsersManager'; request += '&action=recordUserSettings'; @@ -21,6 +28,7 @@ function getUserSettingsAJAX() request += '&defaultReport='+defaultReport; request += '&defaultDate='+defaultDate; request += '&token_auth=' + piwik.token_auth; + ajaxRequest.data = request; return ajaxRequest; } @@ -46,12 +54,6 @@ function getAnonymousUserSettingsAJAX() $(document).ready( function() { $('#userSettingsSubmit').click( function() { $.ajax( getUserSettingsAJAX() ); - var defaultDate = $('input[name=defaultDate]:checked').val(); - if(defaultDate == 'today' || defaultDate == 'yesterday') { - broadcast.propagateNewPage('period=day&date='+defaultDate); - } else { - broadcast.propagateNewPage('date=today&period='+defaultDate); - } }); $('#userSettingsTable input').keypress( function(e) { var key=e.keyCode || e.which; |