diff --git a/addons/base/static/src/js/data.js b/addons/base/static/src/js/data.js index fb926a2a592..9e9f2b42323 100644 --- a/addons/base/static/src/js/data.js +++ b/addons/base/static/src/js/data.js @@ -359,12 +359,17 @@ openerp.base.DataSet = openerp.base.Widget.extend( /** @lends openerp.base.Data name_get: function(ids, callback) { return this.call_and_eval('name_get', [ids, this.get_context()], null, 1, callback); }, - /* - * args = domain + /** + * + * @param {String} name name to perform a search for/on + * @param {Array} [domain=[]] filters for the objects returned, OpenERP domain + * @param {String} [operator='ilike'] matching operator to use with the provided name value + * @param {Number} [limit=100] maximum number of matches to return + * @param {Function} callback function to call with name_search result */ - name_search: function (name, args, operator, limit, callback) { + name_search: function (name, domain, operator, limit, callback) { return this.call_and_eval('name_search', - [name || '', args || false, operator || 'ilike', this.get_context(), limit || 100], + [name || '', domain || false, operator || 'ilike', this.get_context(), limit || 100], 1, 3, callback); }, name_create: function(name, callback) { diff --git a/addons/base/static/test/search-date.js b/addons/base/static/test/search-date.js deleted file mode 100644 index e5ada00379e..00000000000 --- a/addons/base/static/test/search-date.js +++ /dev/null @@ -1,74 +0,0 @@ -$(document).ready(function () { - var openerp; - function get_widget(attrs) { - var widget = new openerp.base.search.DateField( - {attrs: attrs}, {name: 'foo'}, {inputs: []}); - $('#qunit-fixture').html(widget.render({})); - widget.start(); - return widget; - } - - module('search-date', { - setup: function () { - openerp = window.openerp.init(true); - window.openerp.base.core(openerp); - window.openerp.base.chrome(openerp); - window.openerp.base.views(openerp); - window.openerp.base.search(openerp); - } - }); - test('no values', function () { - var widget = get_widget(); - deepEqual(widget.get_values(), {}); - strictEqual(widget.get_context(), null); - strictEqual(widget.get_domain(), null); - }); - test('filled from', function () { - var widget = get_widget(); - widget.$element.find('input:eq(0)').val('1912-06-23'); - - deepEqual(widget.get_values(), {from: '1912-06-23'}); - strictEqual(widget.get_context(), null); - deepEqual(widget.get_domain(), [['foo', '>=', '1912-06-23']]); - }); - test('filled to', function () { - var widget = get_widget(); - widget.$element.find('input:eq(1)').val('1954-06-07'); - - deepEqual(widget.get_values(), {to: '1954-06-07'}); - strictEqual(widget.get_context(), null); - deepEqual(widget.get_domain(), [['foo', '<=', '1954-06-07']]); - }); - test('filled both', function () { - var widget = get_widget(); - widget.$element.find('input:eq(0)').val('1912-06-23'); - widget.$element.find('input:eq(1)').val('1954-06-07'); - - deepEqual(widget.get_values(), {from: '1912-06-23', to: '1954-06-07'}); - strictEqual(widget.get_context(), null); - deepEqual(widget.get_domain(), - [['foo', '>=', '1912-06-23'], ['foo', '<=', '1954-06-07']]); - }); - test('custom context', function () { - var widget = get_widget({context: {__id: -1}}); - widget.$element.find('input:eq(0)').val('1912-06-23'); - widget.$element.find('input:eq(1)').val('1954-06-07'); - - deepEqual( - widget.get_context(), - {__id: -1, - own_values: { - self: {from: '1912-06-23', to: '1954-06-07'}}}); - }); - test('custom filter_domain', function () { - var widget = get_widget({filter_domain: {__id: -42}}); - widget.$element.find('input:eq(0)').val('1912-06-23'); - widget.$element.find('input:eq(1)').val('1954-06-07'); - - deepEqual( - widget.get_domain(), - {__id: -42, - own_values: { - self: {from: '1912-06-23', to: '1954-06-07'}}}); - }); -}); diff --git a/addons/base/static/test/test.html b/addons/base/static/test/test.html index 97a73865041..14df778cd02 100644 --- a/addons/base/static/test/test.html +++ b/addons/base/static/test/test.html @@ -39,6 +39,5 @@ -