Merge lp:~credativ/ocb-web/7.0-lp1153853 into lp:ocb-web

[Craig Gowing (credativ)]

[lp:~credativ/ocb-web/7.0-lp1153853]

4200. By Craig Gowing (credativ) on 2014-06-24

[FIX] Prevent form fields from turning into inputs, only fields in an embedded tree view

[Holger Brunn (Therp) (hbrunn)]

please make a pull request for https://github.com/OCA/OCB if you still consider this fix relevant.

[Holger Brunn (Therp) (hbrunn)]

Development for 7.0 has moved to github on https://github.com/OCA/ocb - please move your merge proposal there if it is still valid.

(I close and reject this in order to have a cleaner overview for 6.1 MPs which indeed have to be done on launchpad)

review: Disapprove

Unmerged revisions

4200. By Craig Gowing (credativ) on 2014-06-24

[FIX] Prevent form fields from turning into inputs, only fields in an embedded tree view

4199. By Craig Gowing (credativ) on 2014-06-12

[FIX] Allow readonly text fields to be updated with an onchange handler in a tree view

=== modified file 'addons/web/static/src/js/view_form.js'
--- addons/web/static/src/js/view_form.js	2014-04-18 09:20:33 +0000
+++ addons/web/static/src/js/view_form.js	2014-06-24 09:32:08 +0000
@@ -2283,14 +2283,16 @@
     },
     render_value: function() {
         var show_value = this.format_value(this.get('value'), '');
-        if (!this.get("effective_readonly")) {
-            this.$el.find('input').val(show_value);
-        } else {
+        if (this.get("effective_readonly")) {
             if (this.password) {
                 show_value = new Array(show_value.length + 1).join('*');
             }
-            this.$(".oe_form_char_content").text(show_value);
+            if (this.get("effective_invisible") && this.get("readonly") && !this.get("invisible") && this.name != "sequence") {
+                this.set({"effective_invisible": false});
+            }
         }
+        this.$el.find('input').val(show_value);
+        this.$(".oe_form_char_content").text(show_value);
     },
     is_syntax_valid: function() {
         if (!this.get("effective_readonly") && this.$("input").size() > 0) {
 
=== modified file 'addons/web/static/src/xml/base.xml'
--- addons/web/static/src/xml/base.xml	2014-04-09 09:34:22 +0000
+++ addons/web/static/src/xml/base.xml	2014-06-24 09:32:08 +0000
@@ -1025,7 +1025,19 @@
             /><img class="oe_field_translate oe_input_icon" t-if="widget.field.translate" t-att-src='_s + "/web/static/src/img/icons/terp-translate.png"' width="16" height="16" border="0"/>
         </t>
         <t t-if="widget.get('effective_readonly')">
-            <span class="oe_form_char_content"></span>
+            <t t-if="!widget.get('effective_invisible')">
+                <span class="oe_form_char_content"></span>
+            </t>
+            <t t-if="widget.get('effective_invisible')">
+                <input t-att-type="widget.password ? 'password' : 'text'"
+                    t-att-id="widget.id_for_label"
+                    t-att-tabindex="widget.node.attrs.tabindex"
+                    t-att-autofocus="widget.node.attrs.autofocus"
+                    t-att-placeholder="widget.node.attrs.placeholder"
+                    t-att-maxlength="widget.field.size"
+                    disabled="disabled"
+                />
+            </t>
         </t>
     </span>
 </t>