diff options
| author | Christophe Simonis <chs@odoo.com> | 2016-05-17 14:39:05 +0200 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2016-05-17 14:39:05 +0200 |
| commit | e38ddcfeae647da3da19fee0491606bc70df0dd3 (patch) | |
| tree | 93adc6de97d3cf4f920557e4034447342cbec8ea /addons/web/controllers/main.py | |
| parent | b9fced8ce1acbad3dcfe16edf7a4e0c534706e2f (diff) | |
| parent | b26fd225843d7db33a5f640e4d74efd1c21d6368 (diff) | |
[MERGE] forward port of branch saas-10 up to b26fd22
Diffstat (limited to 'addons/web/controllers/main.py')
| -rw-r--r-- | addons/web/controllers/main.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/addons/web/controllers/main.py b/addons/web/controllers/main.py index c147f84f094..f90f8b7f11f 100644 --- a/addons/web/controllers/main.py +++ b/addons/web/controllers/main.py @@ -623,6 +623,7 @@ class Database(http.Controller): d['insecure'] = openerp.tools.config['admin_passwd'] == 'admin' d['list_db'] = openerp.tools.config['list_db'] d['langs'] = openerp.service.db.exp_list_lang() + d['countries'] = openerp.service.db.exp_list_countries() # databases list d['databases'] = [] try: @@ -644,7 +645,9 @@ class Database(http.Controller): @http.route('/web/database/create', type='http', auth="none", methods=['POST'], csrf=False) def create(self, master_pwd, name, lang, password, **post): try: - request.session.proxy("db").create_database(master_pwd, name, bool(post.get('demo')), lang, password) + # country code could be = "False" which is actually True in python + country_code = post.get('country_code') or False + request.session.proxy("db").create_database(master_pwd, name, bool(post.get('demo')), lang, password, post.get('login'), country_code) request.session.authenticate(name, 'admin', password) return http.local_redirect('/web/') except Exception, e: |