summaryrefslogtreecommitdiff
path: root/addons
diff options
context:
space:
mode:
authorJiten Rangwala (OpenERP) <jra@tinyerp.com>2011-06-09 11:46:00 +0530
committerJiten Rangwala (OpenERP) <jra@tinyerp.com>2011-06-09 11:46:00 +0530
commitb06ea136e08ca6464ef75fa260f3d6822d231658 (patch)
treecb3de8bdeaecaa84f98d7035247ed46b6c9422ce /addons
parent3e74d5d6bc7387b56cc5dc6f45a61c6439039ceb (diff)
[IMP] Get database list from base for mobile login
bzr revid: jra@tinyerp.com-20110609061600-6yuatorqyie7rrwr
Diffstat (limited to 'addons')
-rw-r--r--addons/web_mobile/controllers/main.py4
-rw-r--r--addons/web_mobile/static/src/js/web_mobile.js5
-rw-r--r--addons/web_mobile/static/src/xml/mobile.xml2
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
@@ -59,10 +59,6 @@ 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 @@
<span class="ui-icon ui-icon-arrow-d ui-icon-shadow"></span>
</span>
<select data-native-menu="false" id="database" name="database" tabindex="-1">
- <option t-foreach="db" t-as="opt" t-value="opt">
+ <option t-foreach="db_list" t-as="opt" t-value="opt">
<t t-esc="opt"/>
</option>
</select>