From 1f44208fd7c7ef79122f0c9c3a091c77d7da71e4 Mon Sep 17 00:00:00 2001 From: "noz (OpenERP)" Date: Fri, 1 Jul 2011 12:28:42 +0530 Subject: [PATCH] [FIX] Implement get languages function. bzr revid: noz@tinyerp.com-20110701065842-a9nlwe33lrco3siu --- addons/base/controllers/main.py | 9 +++++++++ addons/base/static/src/css/base.css | 4 ++++ addons/base/static/src/js/chrome.js | 4 ++++ addons/base/static/src/xml/base.xml | 28 +++++++++------------------- 4 files changed, 26 insertions(+), 19 deletions(-) diff --git a/addons/base/controllers/main.py b/addons/base/controllers/main.py index 850069bb141..5f923e7a35a 100644 --- a/addons/base/controllers/main.py +++ b/addons/base/controllers/main.py @@ -110,6 +110,15 @@ class Session(openerpweb.Controller): dbs = proxy.list() return {"db_list": dbs} + + @openerpweb.jsonrequest + def get_lang_list(self, req): + lang_list = [('en_US', 'English (US)')] + try: + lang_list = lang_list + (req.session.proxy("db").list_lang() or []) + except Exception, e: + pass + return {"lang_list": lang_list} @openerpweb.jsonrequest def modules(self, req): diff --git a/addons/base/static/src/css/base.css b/addons/base/static/src/css/base.css index 4de49032d1b..e6d475b4bc2 100644 --- a/addons/base/static/src/css/base.css +++ b/addons/base/static/src/css/base.css @@ -189,6 +189,10 @@ ul.db_options li { -moz-border-radius: 10px; } +.db_option_table input[type="text"], input[type="password"], select, textarea { + width: 300px; +} + .option_string { font-weight: bold; color: #555; diff --git a/addons/base/static/src/js/chrome.js b/addons/base/static/src/js/chrome.js index cc4f2b8baf7..19104f67e77 100644 --- a/addons/base/static/src/js/chrome.js +++ b/addons/base/static/src/js/chrome.js @@ -927,6 +927,10 @@ openerp.base.Database = openerp.base.Controller.extend({ self.db_list = result.db_list; }); + this.rpc("/base/session/get_lang_list", {}, function(result) { + self.lang_list = result.lang_list; + }); + this.$element.find('#db-create').click(function() { self.db_string = "CREATE DATABASE"; self.$option_id.html(QWeb.render("CreateDB", self)); diff --git a/addons/base/static/src/xml/base.xml b/addons/base/static/src/xml/base.xml index 0a9595caf49..ffe40947ca3 100644 --- a/addons/base/static/src/xml/base.xml +++ b/addons/base/static/src/xml/base.xml @@ -95,9 +95,13 @@ - + + + @@ -127,14 +131,7 @@ @@ -163,14 +160,7 @@