Merge lp:~openerp-dev/openerp-web/trunk-field-completion-xmo into lp:openerp-web

Proposed by Xavier (Open ERP)
Status: Needs review
Proposed branch: lp:~openerp-dev/openerp-web/trunk-field-completion-xmo
Merge into: lp:openerp-web
Diff against target: 35 lines (+11/-7)
1 file modified
addons/web/static/src/js/search.js (+11/-7)
To merge this branch: bzr merge lp:~openerp-dev/openerp-web/trunk-field-completion-xmo
Reviewer Review Type Date Requested Status
OpenERP R&D Web Team Pending
Review via email: mp+198237@code.launchpad.net
To post a comment you must log in.

Unmerged revisions

3900. By Xavier (Open ERP)

[IMP] use new complete_field method in m2o search completion

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'addons/web/static/src/js/search.js'
--- addons/web/static/src/js/search.js 2013-12-02 15:18:38 +0000
+++ addons/web/static/src/js/search.js 2013-12-09 12:08:55 +0000
@@ -535,7 +535,6 @@
535 resp(_(arguments).chain()535 resp(_(arguments).chain()
536 .compact()536 .compact()
537 .map(function (completion) {537 .map(function (completion) {
538 console.log(completion);
539 if (completion.length && completion[0].facet !== undefined) {538 if (completion.length && completion[0].facet !== undefined) {
540 completion[0].first = true;539 completion[0].first = true;
541 }540 }
@@ -1562,12 +1561,17 @@
1562 // FIXME: "concurrent" searches (multiple requests, mis-ordered responses)1561 // FIXME: "concurrent" searches (multiple requests, mis-ordered responses)
1563 var context = instance.web.pyeval.eval(1562 var context = instance.web.pyeval.eval(
1564 'contexts', [this.view.dataset.get_context()]);1563 'contexts', [this.view.dataset.get_context()]);
1565 return this.model.call('name_search', [], {1564 return new instance.web.Model(this.view.model)
1566 name: needle,1565 .call('complete_field', [this.attrs.name, needle], {
1567 args: instance.web.pyeval.eval(1566 field_domain: instance.web.pyeval.eval(
1568 'domains', this.attrs.domain ? [this.attrs.domain] : [], context),1567 'domains', this.attrs.domain ? [this.attrs.domain] : [], context),
1569 limit: 8,1568 // apply action's domain on parent object, but not current
1570 context: context1569 // domain, users won't understand & won't be able to build
1570 // searches easily as completion will depend on current search
1571 // state
1572 parent_domain: this.view.dataset.get_domain(),
1573 limit: 8,
1574 context: context
1571 }).then(function (results) {1575 }).then(function (results) {
1572 if (_.isEmpty(results)) { return null; }1576 if (_.isEmpty(results)) { return null; }
1573 return [{label: self.attrs.string}].concat(1577 return [{label: self.attrs.string}].concat(