diff options
| author | Christophe Simonis <chs@odoo.com> | 2017-10-20 17:24:15 +0200 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2017-10-20 17:24:15 +0200 |
| commit | bee0c11ef7fdd2f289b1b5d33bf4574e519d8fcf (patch) | |
| tree | f763f9a855c0ab0b02f944c88ff6713bbbe3f34f /addons/web | |
| parent | 8096162beeed30debcb1c3945e7f9cee35710666 (diff) | |
| parent | f3ac68ed29a478b8f092a3bc8523df171312a636 (diff) | |
[MERGE] forward port branch saas-14 up to f3ac68ed29a
Diffstat (limited to 'addons/web')
| -rw-r--r-- | addons/web/static/src/js/views/form_widgets.js | 3 | ||||
| -rw-r--r-- | addons/web/static/src/less/modal.less | 2 | ||||
| -rw-r--r-- | addons/web/views/webclient_templates.xml | 2 |
3 files changed, 6 insertions, 1 deletions
diff --git a/addons/web/static/src/js/views/form_widgets.js b/addons/web/static/src/js/views/form_widgets.js index aa60c2792a6..4fe6e9b31b8 100644 --- a/addons/web/static/src/js/views/form_widgets.js +++ b/addons/web/static/src/js/views/form_widgets.js @@ -505,6 +505,9 @@ var FieldDomain = common.AbstractField.extend(common.ReinitializeFieldMixin).ext this.$errorMessage.toggleClass("hidden", this.valid); }).bind(this)); }, + is_false: function () { + return false; + }, is_syntax_valid: function() { return this.field_manager.get("actual_mode") === "view" || this.valid; }, diff --git a/addons/web/static/src/less/modal.less b/addons/web/static/src/less/modal.less index 2a0fbb1fa36..2d6c7562fe2 100644 --- a/addons/web/static/src/less/modal.less +++ b/addons/web/static/src/less/modal.less @@ -52,6 +52,8 @@ .modal-body { overflow: auto; + // fix iOS issue https://github.com/scottjehl/Device-Bugs/issues/8 + -webkit-transform: translate3d(0, 0, 0); min-height: 0; &.o_dialog_error { diff --git a/addons/web/views/webclient_templates.xml b/addons/web/views/webclient_templates.xml index b0c50aacf23..9334708924f 100644 --- a/addons/web/views/webclient_templates.xml +++ b/addons/web/views/webclient_templates.xml @@ -199,7 +199,7 @@ <head> <meta charset="utf-8"/> <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1"/> - <meta name="viewport" content="width=device-width, initial-scale=1"/> + <meta name="viewport" content="width=device-width, initial-scale=1, user-scalable=no"/> <title t-esc="title or 'Odoo'"/> <link type="image/x-icon" rel="shortcut icon" t-att-href="x_icon or '/web/static/src/img/favicon.ico'"/> |