diff options
| author | Christophe Simonis <chs@odoo.com> | 2016-02-17 18:01:11 +0100 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2016-02-17 18:01:11 +0100 |
| commit | 87a01c75ef1dde98bc31f714d8ac4b2ea598e316 (patch) | |
| tree | 4fe33a648fc7de34294113ff2c69e2e28b133b85 /addons/web/static/src | |
| parent | d70fde0330550d510668e49807da83e646e8ccec (diff) | |
| parent | 5be43b8d9ae4485ac28e9afb7dd7cdecefb58abc (diff) | |
[MERGE] forward port of branch saas-7 up to 5be43b8
Diffstat (limited to 'addons/web/static/src')
| -rw-r--r-- | addons/web/static/src/js/framework/utils.js | 2 | ||||
| -rw-r--r-- | addons/web/static/src/js/views/form_common.js | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/addons/web/static/src/js/framework/utils.js b/addons/web/static/src/js/framework/utils.js index a0ab37a7dfb..c1b9758b625 100644 --- a/addons/web/static/src/js/framework/utils.js +++ b/addons/web/static/src/js/framework/utils.js @@ -468,7 +468,7 @@ function autoresize ($textarea, options) { var $fixed_text_area; var min_height = (options && options.min_height) || 50; if (!$fixed_text_area) { - $fixed_text_area = $('<textarea>').css({ + $fixed_text_area = $('<textarea disabled>').css({ position: 'absolute', opacity: 0, height: 10, diff --git a/addons/web/static/src/js/views/form_common.js b/addons/web/static/src/js/views/form_common.js index 80342f42ee8..7364eeec203 100644 --- a/addons/web/static/src/js/views/form_common.js +++ b/addons/web/static/src/js/views/form_common.js @@ -867,7 +867,7 @@ var FormViewDialog = ViewDialog.extend({ ]; if(!readonly) { - options.buttons.splice(0, 0, {text: _t("Save") + ((multi_select)? _t(" & Close") : ""), classes: "btn-primary o_formdialog_save", click: function() { // o_formdialog_save class for web_tests! + options.buttons.splice(0, 0, {text: _t("Save") + ((multi_select)? " " + _t(" & Close") : ""), classes: "btn-primary o_formdialog_save", click: function() { // o_formdialog_save class for web_tests! self.view_form.onchanges_mutex.def.then(function() { if (!self.view_form.warning_displayed) { $.when(self.view_form.save()).done(function() { |