Antony Lesuisse (OpenERP) has proposed merging
lp:~openerp-dev/openerp-web/trunk-redirect-dbmanage-sgo into lp:openerp-web.
Requested reviews:
OpenERP R&D Web Team (openerp-dev-web)
For more details, see:
https://code.launchpad.net/~openerp-dev/openerp-web/trunk-redirect-dbmanage-sgo/+merge/114900
--
https://code.launchpad.net/~openerp-dev/openerp-web/trunk-redirect-dbmanage-sgo/+merge/114900
Your team OpenERP R&D Team is subscribed to branch
lp:~openerp-dev/openerp-web/trunk-redirect-dbmanage-sgo.
=== modified file 'addons/web/static/src/js/chrome.js'
--- addons/web/static/src/js/chrome.js 2012-07-13 15:01:56 +0000
+++ addons/web/static/src/js/chrome.js 2012-07-13 16:13:22 +0000
@@ -482,22 +482,26 @@
}
}
},
+ open_db_manager: function(){
+ var self = this;
+ self.$element.find('.oe_login_bottom').hide();
+ self.$element.find('.oe_login_pane').hide();
+ self.databasemanager = new instance.web.DatabaseManager(self);
+ self.databasemanager.appendTo(self.$element);
+ self.databasemanager.do_exit.add_last(function() {
+ self.databasemanager.destroy();
+ self.$element.find('.oe_login_bottom').show();
+ self.$element.find('.oe_login_pane').show();
+ self.load_db_list(true).then(self.proxy('_db_list_loaded'));
+ });
+ },
start: function() {
var self = this;
self.$element.find("form").submit(self.on_submit);
-
+
self.$element.find('.oe_login_manage_db').click(function() {
- self.$element.find('.oe_login_bottom').hide();
- self.$element.find('.oe_login_pane').hide();
- self.databasemanager = new instance.web.DatabaseManager(self);
- self.databasemanager.appendTo(self.$element);
- self.databasemanager.do_exit.add_last(function() {
- self.databasemanager.destroy();
- self.$element.find('.oe_login_bottom').show();
- self.$element.find('.oe_login_pane').show();
- self.load_db_list(true).then(self.proxy('_db_list_loaded'));
- });
+ self.open_db_manager();
});
return self.load_db_list().then(self.proxy('_db_list_loaded'));
},
@@ -515,12 +519,17 @@
return d;
},
_db_list_loaded: function () {
+ var self = this;
var list = this._db_list,
dbdiv = this.$element.find('div.oe_login_dbpane');
this.$element.find("[name=db]").replaceWith(instance.web.qweb.render('Login.dblist', { db_list: list, selected_db: this.selected_db}));
if(list && list.length === 1) {
dbdiv.hide();
- } else {
+ }
+ if(list.length === 0){
+ self.open_db_manager();
+ }
+ else {
dbdiv.show();
}
},
_______________________________________________
Mailing list: https://launchpad.net/~openerp-dev-gtk
Post to : [email protected]
Unsubscribe : https://launchpad.net/~openerp-dev-gtk
More help : https://help.launchpad.net/ListHelp