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 | |
| parent | 198c080b3512e8b7fbcd9ab47d15746776d5d1a6 (diff) | |
| parent | 897b9b8fc0548c5165d30b7f20b47aa00e918f1d (diff) | |
[MERGE] forward port branch saas-10 up to 897b9b8
Diffstat (limited to 'addons/web')
| -rw-r--r-- | addons/web/controllers/main.py | 4 | ||||
| -rw-r--r-- | addons/web/static/src/js/views/form_widgets.js | 2 | ||||
| -rw-r--r-- | addons/web/static/src/js/views/pivot_view.js | 1 | ||||
| -rw-r--r-- | addons/web/views/database_manager.html | 2 |
4 files changed, 4 insertions, 5 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 diff --git a/addons/web/static/src/js/views/form_widgets.js b/addons/web/static/src/js/views/form_widgets.js index 3bc97996962..3b4628322f7 100644 --- a/addons/web/static/src/js/views/form_widgets.js +++ b/addons/web/static/src/js/views/form_widgets.js @@ -1440,7 +1440,7 @@ var FieldStatus = common.AbstractField.extend({ }); } } - }, 300), + }, 300, true), }); var FieldMonetary = FieldFloat.extend({ diff --git a/addons/web/static/src/js/views/pivot_view.js b/addons/web/static/src/js/views/pivot_view.js index 83e75faf9a6..264fa2af985 100644 --- a/addons/web/static/src/js/views/pivot_view.js +++ b/addons/web/static/src/js/views/pivot_view.js @@ -692,7 +692,6 @@ var PivotView = View.extend({ if (width > 1) { var total_cell = {width:nbr_measures, height: depth, title:""}; if (nbr_measures === 1) { - total_cell.title = this.measures[this.active_measures[0]].string; total_cell.total = true; } result[0].push(total_cell); diff --git a/addons/web/views/database_manager.html b/addons/web/views/database_manager.html index dfcb95d4d05..7cef4678e8d 100644 --- a/addons/web/views/database_manager.html +++ b/addons/web/views/database_manager.html @@ -69,7 +69,7 @@ <div class="row"> <div class="col-md-12"> <label for="login" class="control-label">Email</label> - <input id="login" type="text" name="login" class="form-control" autocomplete="off"/> + <input id="login" type="text" name="login" class="form-control" required="required" autocomplete="off"/> </div> </div> </div> |