diff options
| author | Christophe Simonis <chs@odoo.com> | 2016-09-02 17:23:34 +0200 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2016-09-02 17:23:34 +0200 |
| commit | 55d2e4b7cf4465be0a56e6748d401ef22c4cc7d6 (patch) | |
| tree | 7a4eb9aea8e03676edfe12ab74793998d86820a3 /addons/web/controllers | |
| parent | a13c15fd442bbfc5c283f71c8d349e33bc70cf6a (diff) | |
| parent | bde7f883b79c6f3ae581aea06928a987827c68e4 (diff) | |
[MERGE] forward port branch saas-11 up to bde7f88
Diffstat (limited to 'addons/web/controllers')
| -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 f991d5eca07..508f623a75b 100644 --- a/addons/web/controllers/main.py +++ b/addons/web/controllers/main.py @@ -631,8 +631,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 |