Merge lp:~openerp-dev/openerp-web/7.0-opw-601553-xal into lp:openerp-web/7.0

[Xavier ALT]

Hi,

This MP fix fields.reference in editable tree view.

For example, try to change tree view of "System / Technical / Parameters / Configuration Parameters" to editable, it's was not possible change "Resource" (res_id) field (missing original value, selection field not visible, ...)

Regards,
Xavier

[Martin Trigaux (OpenERP) (mat-openerp)]

Thanks for the patch, LGTM, I have just removed the left console.log and merged it in 7.0

revno: 4111 [merge]
revision-id: <email address hidden>

review: Approve

=== modified file 'addons/web/static/src/css/base.css'
--- addons/web/static/src/css/base.css	2014-01-03 09:44:15 +0000
+++ addons/web/static/src/css/base.css	2014-01-14 12:48:18 +0000
@@ -2850,6 +2850,9 @@
 .openerp .oe_list.oe_list_editable.oe_editing .oe_form_field.oe_form_field_datetime input.oe_datepicker_master, .openerp .oe_list.oe_list_editable.oe_editing .oe_form_field.oe_form_field_date input.oe_datepicker_master {
   width: 100% !important;
 }
+.openerp .oe_list.oe_list_editable.oe_editing .oe_form_field.oe_form_field_reference {
+  display: table;
+}
 .openerp .oe_list_group_name {
   white-space: nowrap;
 }

=== modified file 'addons/web/static/src/css/base.sass'
--- addons/web/static/src/css/base.sass	2014-01-03 09:44:15 +0000
+++ addons/web/static/src/css/base.sass	2014-01-14 12:48:18 +0000
@@ -2243,6 +2243,8 @@
             &.oe_form_field_datetime,&.oe_form_field_date
                 input.oe_datepicker_master
                     width: 100% !important
+            &.oe_form_field_reference
+                display: table
     .oe_list_group_name
         white-space: nowrap
     // }}}

=== modified file 'addons/web/static/src/js/view_list.js'
--- addons/web/static/src/js/view_list.js	2013-12-11 11:33:30 +0000
+++ addons/web/static/src/js/view_list.js	2014-01-14 12:48:18 +0000
@@ -1022,7 +1022,7 @@
                     id = parseInt(ref_match[2], 10);
                 new instance.web.DataSet(this.view, model).name_get([id]).done(function(names) {
                     if (!names.length) { return; }
-                    record.set(column.id, names[0][1]);
+                    record.set(column.id + '__display', names[0][1]);
                 });
             }
         } else if (column.type === 'many2one') {
@@ -2095,6 +2095,7 @@
     'field.handle': 'instance.web.list.Handle',
     'button': 'instance.web.list.Button',
     'field.many2onebutton': 'instance.web.list.Many2OneButton',
+    'field.reference': 'instance.web.list.Reference',
     'field.many2many': 'instance.web.list.Many2Many'
 });
 instance.web.list.columns.for_ = function (id, field, node) {
@@ -2307,5 +2308,19 @@
         return this._super(row_data, options);
     }
 });
+instance.web.list.Reference = instance.web.list.Column.extend({
+    _format: function (row_data, options) {
+        if (!_.isEmpty(row_data[this.id].value)) {
+            // If value, use __display version for printing
+            //console.log('_format', row_data[this.id], row_data[this.id + '__display']);
+            if (!!row_data[this.id + '__display']) {
+                row_data[this.id] = row_data[this.id + '__display'];
+            } else {
+                row_data[this.id] = {'value': ''};
+            }
+        }
+        return this._super(row_data, options);
+    }
+});
 };
 // vim:et fdc=0 fdl=0 foldnestmax=3 fdm=syntax: