summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristophe Monniez <moc@odoo.com>2018-08-19 12:42:59 +0200
committerChristophe Monniez <moc@odoo.com>2018-09-18 13:54:19 +0200
commit83e460b8daf4b3d0a9e05ba93aa57f32d74b5f4f (patch)
tree19455f829cd552d1b528c5bbafe6a161d4cbda40
parented2773e381585ee3fd0c6b90e6f97f8f1237e6f4 (diff)
[IMP] web: add a phone input to the database manager
Task: 1879675
-rw-r--r--addons/web/controllers/main.py2
-rw-r--r--addons/web/views/database_manager.html6
-rw-r--r--odoo/service/db.py16
3 files changed, 14 insertions, 10 deletions
diff --git a/addons/web/controllers/main.py b/addons/web/controllers/main.py
index 94d84399509..9c219b40798 100644
--- a/addons/web/controllers/main.py
+++ b/addons/web/controllers/main.py
@@ -701,7 +701,7 @@ class Database(http.Controller):
raise Exception(_('Invalid database name. Only alphanumerical characters, underscore, hyphen and dot are allowed.'))
# country code could be = "False" which is actually True in python
country_code = post.get('country_code') or False
- dispatch_rpc('db', 'create_database', [master_pwd, name, bool(post.get('demo')), lang, password, post['login'], country_code])
+ dispatch_rpc('db', 'create_database', [master_pwd, name, bool(post.get('demo')), lang, password, post['login'], country_code, post['phone']])
request.session.authenticate(name, post['login'], password)
return http.local_redirect('/web/')
except Exception as e:
diff --git a/addons/web/views/database_manager.html b/addons/web/views/database_manager.html
index 32282098397..5ffef995f96 100644
--- a/addons/web/views/database_manager.html
+++ b/addons/web/views/database_manager.html
@@ -89,6 +89,12 @@
</div>
</div>
</div>
+ <div class="form-group row">
+ <label for="phone" class="col-md-4 col-form-label">Phone number</label>
+ <div class="col-md-8 input-group">
+ <input id="phone" type="tel" name="phone" class="form-control" autocomplete="off"/>
+ </div>
+ </div>
<div class="form-row">
<div class="col-lg-6 form-group">
<label for="lang" class="col-form-label">Language</label>
diff --git a/odoo/service/db.py b/odoo/service/db.py
index d62a2f68cca..1092c83e913 100644
--- a/odoo/service/db.py
+++ b/odoo/service/db.py
@@ -50,7 +50,7 @@ def check_super(passwd):
raise odoo.exceptions.AccessDenied()
# This should be moved to odoo.modules.db, along side initialize().
-def _initialize_db(id, db_name, demo, lang, user_password, login='admin', country_code=None):
+def _initialize_db(id, db_name, demo, lang, user_password, login='admin', country_code=None, phone=None):
try:
db = odoo.sql_db.db_connect(db_name)
with closing(db.cursor()) as cr:
@@ -69,12 +69,10 @@ def _initialize_db(id, db_name, demo, lang, user_password, login='admin', countr
modules._update_translations(lang)
if country_code:
- countries = env['res.country'].search([('code', 'ilike', country_code)])
- if countries:
- comp_local = {'country_id': countries[0].id}
- if countries[0].currency_id:
- comp_local['currency_id'] = countries[0].currency_id.id
- env['res.company'].browse(1).write(comp_local)
+ country = env['res.country'].search([('code', 'ilike', country_code)])[0]
+ env['res.company'].browse(1).write({'country_id': country_code and country.id, 'currency_id': country_code and country.currency_id.id, 'phone':phone})
+ elif phone:
+ env['res.company'].browse(1).write({'phone': phone})
# update admin's password and lang and login
values = {'password': user_password, 'lang': lang}
@@ -109,11 +107,11 @@ def _create_empty_database(name):
)
@check_db_management_enabled
-def exp_create_database(db_name, demo, lang, user_password='admin', login='admin', country_code=None):
+def exp_create_database(db_name, demo, lang, user_password='admin', login='admin', country_code=None, phone=None):
""" Similar to exp_create but blocking."""
_logger.info('Create database `%s`.', db_name)
_create_empty_database(db_name)
- _initialize_db(id, db_name, demo, lang, user_password, login, country_code)
+ _initialize_db(id, db_name, demo, lang, user_password, login, country_code, phone)
return True
@check_db_management_enabled