[FIX] server-sourced fields_get has no indirection to the model's fields
authorXavier Morel <xmo@openerp.com>
Thu, 29 Nov 2012 10:38:41 +0000 (11:38 +0100)
committerXavier Morel <xmo@openerp.com>
Thu, 29 Nov 2012 10:38:41 +0000 (11:38 +0100)
previous searchview-controller wrapper method did. Remove leftover indirection deref

bzr revid: xmo@openerp.com-20121129103841-6qcl4sctekqmrt2q

addons/web/static/src/js/search.js
addons/web/static/test/search.js

index 29fa71b..5b59c7d 100644 (file)
@@ -1708,7 +1708,7 @@ instance.web.search.Advanced = instance.web.search.Input.extend({
             new instance.web.Model(this.view.model).call('fields_get').done(function(data) {
                 self.fields = _.extend({
                     id: { string: 'ID', type: 'id' }
-                }, data.fields);
+                }, data);
         })).done(function () {
             self.append_proposition();
         });
index 870ce24..45f6d2c 100644 (file)
@@ -178,9 +178,9 @@ var makeSearchView = function (instance, dummy_widget_attributes, defaults) {
         return [];
     };
     instance.session.responses['dummy.model:fields_get'] = function () {
-        return {fields: {
+        return {
             dummy: {type: 'char', string: 'Dummy'}
-        }};
+        };
     };
 
     var dataset = {model: 'dummy.model', get_context: function () { return {}; }};