diff options
| author | Christophe Simonis <chs@odoo.com> | 2016-09-02 16:28:28 +0200 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2016-09-02 16:28:28 +0200 |
| commit | 54e5bbdf3531ecfee84fb6aae627d346c2425c30 (patch) | |
| tree | 2920139e3f9b019371cb2f332a53e0ab5ff8d142 /addons/web/controllers/main.py | |
| parent | 198c080b3512e8b7fbcd9ab47d15746776d5d1a6 (diff) | |
| parent | 897b9b8fc0548c5165d30b7f20b47aa00e918f1d (diff) | |
[MERGE] forward port branch saas-10 up to 897b9b8
Diffstat (limited to 'addons/web/controllers/main.py')
| -rw-r--r-- | addons/web/controllers/main.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/addons/web/controllers/main.py b/addons/web/controllers/main.py index 902e7500650..057bdd45aef 100644 --- a/addons/web/controllers/main.py +++ b/addons/web/controllers/main.py @@ -638,8 +638,8 @@ class Database(http.Controller): try: # 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) + request.session.proxy("db").create_database(master_pwd, name, bool(post.get('demo')), lang, password, post['login'], country_code) + request.session.authenticate(name, post['login'], password) return http.local_redirect('/web/') except Exception, e: error = "Database creation error: %s" % e |