Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/phpmyadmin/phpmyadmin.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPiotr Przybylski <piotrprz@gmail.com>2013-11-03 15:38:51 +0400
committerPiotr Przybylski <piotrprz@gmail.com>2013-11-03 15:38:51 +0400
commita75b5a6e2cacd9a2c17e88b9efe40304ef280738 (patch)
tree7fd7128e531cae3e3c94286e98fcfa7a8475ce95 /js/config.js
parentc48b78d7737bd7f1fdb3edb303fabcdd226d804f (diff)
Fix saving user preferences to configuration storage
'server' parameter was not passed, so it was broken when default server required authentication added missing AJAX operation result check
Diffstat (limited to 'js/config.js')
-rw-r--r--js/config.js27
1 files changed, 16 insertions, 11 deletions
diff --git a/js/config.js b/js/config.js
index d064b62b57..9113c850ae 100644
--- a/js/config.js
+++ b/js/config.js
@@ -727,20 +727,25 @@ function savePrefsToLocalStorage(form)
type: 'POST',
data: {
ajax_request: true,
+ server: form.find('input[name=server]').val(),
token: form.find('input[name=token]').val(),
submit_get_json: true
},
- success: function (response) {
- window.localStorage['config'] = response.prefs;
- window.localStorage['config_mtime'] = response.mtime;
- window.localStorage['config_mtime_local'] = (new Date()).toUTCString();
- updatePrefsDate();
- $('div.localStorage-empty').hide();
- $('div.localStorage-exists').show();
- var group = form.parent('.group');
- group.css('height', group.height() + 'px');
- form.hide('fast');
- form.prev('.click-hide-message').show('fast');
+ success: function (data) {
+ if (data.success === true) {
+ window.localStorage['config'] = data.prefs;
+ window.localStorage['config_mtime'] = data.mtime;
+ window.localStorage['config_mtime_local'] = (new Date()).toUTCString();
+ updatePrefsDate();
+ $('div.localStorage-empty').hide();
+ $('div.localStorage-exists').show();
+ var group = form.parent('.group');
+ group.css('height', group.height() + 'px');
+ form.hide('fast');
+ form.prev('.click-hide-message').show('fast');
+ } else {
+ PMA_ajaxShowMessage(data.error);
+ }
},
complete: function () {
submit.prop('disabled', false);