From b06ea136e08ca6464ef75fa260f3d6822d231658 Mon Sep 17 00:00:00 2001 From: "Jiten Rangwala (OpenERP)" Date: Thu, 9 Jun 2011 11:46:00 +0530 Subject: [PATCH] [IMP] Get database list from base for mobile login bzr revid: jra@tinyerp.com-20110609061600-6yuatorqyie7rrwr --- addons/web_mobile/controllers/main.py | 4 ---- addons/web_mobile/static/src/js/web_mobile.js | 5 +++-- addons/web_mobile/static/src/xml/mobile.xml | 2 +- 3 files changed, 4 insertions(+), 7 deletions(-) diff --git a/addons/web_mobile/controllers/main.py b/addons/web_mobile/controllers/main.py index b04630d9f41..396bf3b31f9 100644 --- a/addons/web_mobile/controllers/main.py +++ b/addons/web_mobile/controllers/main.py @@ -58,10 +58,6 @@ class Xml2Json: class MOBILE(openerpweb.Controller): _cp_path = "/web_mobile/mobile" - @openerpweb.jsonrequest - def db_list(self, req): - return req.session.proxy('db').list() - @openerpweb.jsonrequest def sc_list(self, req): return req.session.model('ir.ui.view_sc').get_sc(req.session._uid, "ir.ui.menu", {}) diff --git a/addons/web_mobile/static/src/js/web_mobile.js b/addons/web_mobile/static/src/js/web_mobile.js index 1b7a1394bb5..477d1496848 100644 --- a/addons/web_mobile/static/src/js/web_mobile.js +++ b/addons/web_mobile/static/src/js/web_mobile.js @@ -232,8 +232,9 @@ openerp.web_mobile.Login = openerp.base.Controller.extend({ var self = this; jQuery("#oe_header").children().remove(); - this.rpc('/web_mobile/mobile/db_list',{} ,function(res){ - self.$element.html(QWeb.render("Login", {'db' : res})); + this.rpc("/base/session/get_databases_list", {}, function(result) { + self.db_list = result.db_list; + self.$element.html(QWeb.render("Login", self)); self.$element.find('#database').click(self.on_select); self.$element.find("a").click(self.on_clicked); }) diff --git a/addons/web_mobile/static/src/xml/mobile.xml b/addons/web_mobile/static/src/xml/mobile.xml index 4c3560fd186..bc68a800cfe 100644 --- a/addons/web_mobile/static/src/xml/mobile.xml +++ b/addons/web_mobile/static/src/xml/mobile.xml @@ -38,7 +38,7 @@