diff options
| author | Christophe Simonis <chs@odoo.com> | 2014-08-20 17:51:20 +0200 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2014-08-20 17:51:20 +0200 |
| commit | ddef2dd10aabf0e77bf63c462d5f29e353b6b53a (patch) | |
| tree | 9223b5781b9aa173b45539e652f6d7c7717f2c4e /addons/web/static | |
| parent | e2532dd8e0ee1b10fa0e1e06bb1c869d4a56c833 (diff) | |
| parent | 8f13e8320edaca58fe19bb4ed4a2ad515f1c8515 (diff) | |
[MERGE] forward port of branch saas-3 up to 8f13e83
Diffstat (limited to 'addons/web/static')
| -rw-r--r-- | addons/web/static/src/js/view_form.js | 2 | ||||
| -rw-r--r-- | addons/web/static/src/js/view_list_editable.js | 2 | ||||
| -rw-r--r-- | addons/web/static/src/xml/base.xml | 20 |
3 files changed, 13 insertions, 11 deletions
diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js index a11f0a4e771..6c9379f958d 100644 --- a/addons/web/static/src/js/view_form.js +++ b/addons/web/static/src/js/view_form.js @@ -2810,7 +2810,7 @@ instance.web.form.FieldTextHtml = instance.web.form.AbstractField.extend(instanc if (! this.get("effective_readonly")) { self._updating_editor = false; this.$textarea = this.$el.find('textarea'); - var width = ((this.node.attrs || {}).editor_width || '100%'); + var width = ((this.node.attrs || {}).editor_width || 'auto'); var height = ((this.node.attrs || {}).editor_height || 250); this.$textarea.cleditor({ width: width, // width not including margins, borders or padding diff --git a/addons/web/static/src/js/view_list_editable.js b/addons/web/static/src/js/view_list_editable.js index 144de8eb21c..4bff19baf30 100644 --- a/addons/web/static/src/js/view_list_editable.js +++ b/addons/web/static/src/js/view_list_editable.js @@ -258,7 +258,7 @@ if (!focus_field){ focus_field = _.find(self.editor.form.fields_order, function(field){ return fields[field] && fields[field].$el.is(':visible:has(input)'); }); } - if (focus_field) fields[focus_field].$el.find('input').select(); + if (focus_field && fields[focus_field]) fields[focus_field].$el.find('input').select(); return record.attributes; }); }).fail(function () { diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml index 864353ab891..238058c0ce9 100644 --- a/addons/web/static/src/xml/base.xml +++ b/addons/web/static/src/xml/base.xml @@ -1266,16 +1266,18 @@ </t> <t t-name="FieldBinaryImage"> <span class="oe_form_field oe_form_field_image" t-att-style="widget.node.attrs.style"> - <div class="oe_form_field_image_controls oe_edit_only"> - <t t-call="HiddenInputFile"> - <t t-set="fileupload_id" t-value="widget.fileupload_id"/> - Edit - </t> - <div class="oe_form_binary_progress" style="display: none"> - <img t-att-src='_s + "/web/static/src/img/throbber.gif"' width="16" height="16"/> - <b>Uploading ...</b> + <t t-if="!widget.get('effective_readonly')"> + <div class="oe_form_field_image_controls oe_edit_only"> + <t t-call="HiddenInputFile"> + <t t-set="fileupload_id" t-value="widget.fileupload_id"/> + Edit + </t> + <div class="oe_form_binary_progress" style="display: none"> + <img t-att-src='_s + "/web/static/src/img/throbber.gif"' width="16" height="16"/> + <b>Uploading ...</b> + </div> </div> - </div> + </t> </span> </t> <t t-name="FieldBinaryImage-img"> |