Merge lp:~openerp-dev/openerp-web/trunk-bug-844651-vme into lp:openerp-web

Proposed by Vidhin Mehta (OpenERP)
Status: Needs review
Proposed branch: lp:~openerp-dev/openerp-web/trunk-bug-844651-vme
Merge into: lp:openerp-web
Diff against target: 50 lines (+20/-2)
2 files modified
addons/web/static/src/js/search.js (+16/-1)
addons/web/static/src/xml/base.xml (+4/-1)
To merge this branch: bzr merge lp:~openerp-dev/openerp-web/trunk-bug-844651-vme
Reviewer Review Type Date Requested Status
OpenERP R&D Web Team Pending
Review via email: mp+136868@code.launchpad.net

Description of the change

> Make Reference widget for reference field in advance search view which can search with string (Partner,Agrolait).
> To select reference object, selection box render.
> Server side branch:https://code.launchpad.net/~openerp-dev/openobject-server/trunk-bug-844651-vme.

To post a comment you must log in.

Unmerged revisions

3502. By Vidhin Mehta (OpenERP)

[IMP]make reference widget web side for advance search view.changes from server is in progress

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'addons/web/static/src/js/search.js'
2--- addons/web/static/src/js/search.js 2012-11-23 06:45:25 +0000
3+++ addons/web/static/src/js/search.js 2012-11-29 08:42:25 +0000
4@@ -1982,7 +1982,21 @@
5 return true;
6 }
7 });
8-
9+instance.web.search.ExtendedSearchProposition.Reference = instance.web.search.ExtendedSearchProposition.Field.extend({
10+ template: 'SearchView.extended_search.proposition.reference',
11+ operators: [
12+ {value: "ilike", text: _lt("contains")},
13+ {value: "not ilike", text: _lt("doesn't contain")},
14+ {value: "=", text: _lt("is equal to")},
15+ {value: "!=", text: _lt("is not equal to")}
16+ ],
17+ get_value: function() {
18+ return this.$el.filter('select').val() +","+this.$el.filter('input').val();
19+ },
20+ toString: function () {
21+ return this.$el.filter('select').find("option:selected").text() +","+this.$el.filter('input').val();
22+ }
23+});
24 instance.web.search.custom_filters = new instance.web.Registry({
25 'char': 'instance.web.search.ExtendedSearchProposition.Char',
26 'text': 'instance.web.search.ExtendedSearchProposition.Char',
27@@ -1996,6 +2010,7 @@
28 'float': 'instance.web.search.ExtendedSearchProposition.Float',
29 'boolean': 'instance.web.search.ExtendedSearchProposition.Boolean',
30 'selection': 'instance.web.search.ExtendedSearchProposition.Selection',
31+ 'reference': 'instance.web.search.ExtendedSearchProposition.Reference',
32
33 'id': 'instance.web.search.ExtendedSearchProposition.Id'
34 });
35
36=== modified file 'addons/web/static/src/xml/base.xml'
37--- addons/web/static/src/xml/base.xml 2012-11-28 16:03:44 +0000
38+++ addons/web/static/src/xml/base.xml 2012-11-29 08:42:25 +0000
39@@ -1630,7 +1630,10 @@
40 </t>
41 </select>
42 </t>
43-
44+<t t-name="SearchView.extended_search.proposition.reference">
45+ <t t-call="SearchView.extended_search.proposition.selection"/>
46+ <t t-call="SearchView.extended_search.proposition.char"/>
47+</t>
48 <t t-name="ExportView">
49 <a id="exportview" href="javascript: void(0)" style="text-decoration: none;color: #3D3D3D;">Export</a>
50 </t>