Fixed intermittent error "Connection Lost" shown while connecting to database.
parent
94051a0991
commit
33953e9119
|
@ -302,8 +302,9 @@ define('pgadmin.node.database', [
|
||||||
data.is_connecting = true;
|
data.is_connecting = true;
|
||||||
connect_to_database(this, data, pgBrowser.tree, item, false);
|
connect_to_database(this, data, pgBrowser.tree, item, false);
|
||||||
}
|
}
|
||||||
|
if(data.connected){
|
||||||
return pgBrowser.Node.callbacks.selected.apply(this, arguments);
|
return pgBrowser.Node.callbacks.selected.apply(this, arguments);
|
||||||
|
}
|
||||||
},
|
},
|
||||||
|
|
||||||
refresh: function(cmd, i) {
|
refresh: function(cmd, i) {
|
||||||
|
@ -448,6 +449,7 @@ define('pgadmin.node.database', [
|
||||||
/* Call enable/disable menu function after database is connected.
|
/* Call enable/disable menu function after database is connected.
|
||||||
To make sure all the menus for database is in the right state */
|
To make sure all the menus for database is in the right state */
|
||||||
pgBrowser.enable_disable_menus.apply(pgBrowser, [_item]);
|
pgBrowser.enable_disable_menus.apply(pgBrowser, [_item]);
|
||||||
|
pgBrowser.Nodes['database'].callbacks.selected(_item, _data);
|
||||||
|
|
||||||
if (!_connected) {
|
if (!_connected) {
|
||||||
setTimeout(function() {
|
setTimeout(function() {
|
||||||
|
|
|
@ -100,7 +100,7 @@ class PGUtilitiesMaintenanceFeatureTest(BaseFeatureTest):
|
||||||
status = False
|
status = False
|
||||||
if table_node:
|
if table_node:
|
||||||
status = True
|
status = True
|
||||||
self.assertTrue(status, "Table name {} is not visible/selected".
|
self.assertTrue(status, "Table name {0} is not visible/selected".
|
||||||
format(self.table_name))
|
format(self.table_name))
|
||||||
table_node.click()
|
table_node.click()
|
||||||
|
|
||||||
|
|
|
@ -70,7 +70,7 @@ class BaseFeatureTest(BaseTestGenerator):
|
||||||
self.after()
|
self.after()
|
||||||
|
|
||||||
def any_step_failed(self):
|
def any_step_failed(self):
|
||||||
for step in self._outcome.result.errors:
|
for step in self._outcome.errors:
|
||||||
if step[1] is not None:
|
if step[1] is not None:
|
||||||
return True
|
return True
|
||||||
return False
|
return False
|
||||||
|
|
Loading…
Reference in New Issue