Bug #3163256 Ajax copy database does not refresh the database list in case the "switch to copied database" option is not ticked

This commit is contained in:
Marc Delisle
2011-01-24 06:20:26 -05:00
parent dec8229eae
commit 251ecae49d
2 changed files with 21 additions and 8 deletions

View File

@@ -187,8 +187,15 @@ function refreshMain(url) {
* @uses lang
* @uses collation_connection
* @uses encodeURIComponent()
* @param boolean force force reloading
*/
function refreshNavigation() {
function refreshNavigation(force) {
// The goTo() function won't refresh in case the target
// url is the same as the url given as parameter, but sometimes
// we want to refresh anyway.
if (typeof force != undefined && force && window.parent && window.parent.frame_navigation) {
window.parent.frame_navigation.location.reload();
} else {
goTo('navigation.php?server=' + encodeURIComponent(server) +
'&token=' + encodeURIComponent(token) +
'&db=' + encodeURIComponent(db) +
@@ -196,6 +203,7 @@ function refreshNavigation() {
'&lang=' + encodeURIComponent(lang) +
'&collation_connection=' + encodeURIComponent(collation_connection)
);
}
}
/**

View File

@@ -100,6 +100,11 @@ $(document).ready(function() {
window.parent.db = data.newname;
window.parent.refreshMain();
window.parent.refreshNavigation();
} else {
// Here we force a refresh because the navigation
// frame url is not changing so this function would
// not refresh it
window.parent.refreshNavigation(true);
}
}
else {