gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'QA_4_0'

Browse Source 
Conflicts:
	js/db_operations.js
This commit is contained in:
Atul Pratap Singh 2013-10-27 23:18:47 +05:30
commit eff2e31c10
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
db_operations.php
View File

@ -172,6 +172,7 @@ if (strlen($db)
'sql_query',
PMA_Util::getMessage(null, $sql_query)
);
$response->addJSON('db', $db);
exit;
}
}

2
js/db_operations.js
View File

@ -79,13 +79,13 @@ AJAX.registerOnload('db_operations.js', function () {
// use messages that stay on screen
$('div.success, div.error').fadeOut();
if (data.success === true) {
PMA_commonParams.set('db', data.newname);
if ($("#checkbox_switch").is(":checked")) {
PMA_commonParams.set('db', data.newname);
PMA_commonActions.refreshMain(false, function () {
PMA_ajaxShowMessage(data.message);
});
} else {
PMA_commonParams.set('db', data.db);
PMA_ajaxShowMessage(data.message);
}
PMA_reloadNavigation();