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
=== modified file 'addons/web/static/src/js/search.js'
--- addons/web/static/src/js/search.js 2012-11-23 06:45:25 +0000
+++ addons/web/static/src/js/search.js 2012-11-29 08:42:25 +0000
@@ -1982,7 +1982,21 @@
1982 return true;1982 return true;
1983 }1983 }
1984});1984});
19851985instance.web.search.ExtendedSearchProposition.Reference = instance.web.search.ExtendedSearchProposition.Field.extend({
1986 template: 'SearchView.extended_search.proposition.reference',
1987 operators: [
1988 {value: "ilike", text: _lt("contains")},
1989 {value: "not ilike", text: _lt("doesn't contain")},
1990 {value: "=", text: _lt("is equal to")},
1991 {value: "!=", text: _lt("is not equal to")}
1992 ],
1993 get_value: function() {
1994 return this.$el.filter('select').val() +","+this.$el.filter('input').val();
1995 },
1996 toString: function () {
1997 return this.$el.filter('select').find("option:selected").text() +","+this.$el.filter('input').val();
1998 }
1999});
1986instance.web.search.custom_filters = new instance.web.Registry({2000instance.web.search.custom_filters = new instance.web.Registry({
1987 'char': 'instance.web.search.ExtendedSearchProposition.Char',2001 'char': 'instance.web.search.ExtendedSearchProposition.Char',
1988 'text': 'instance.web.search.ExtendedSearchProposition.Char',2002 'text': 'instance.web.search.ExtendedSearchProposition.Char',
@@ -1996,6 +2010,7 @@
1996 'float': 'instance.web.search.ExtendedSearchProposition.Float',2010 'float': 'instance.web.search.ExtendedSearchProposition.Float',
1997 'boolean': 'instance.web.search.ExtendedSearchProposition.Boolean',2011 'boolean': 'instance.web.search.ExtendedSearchProposition.Boolean',
1998 'selection': 'instance.web.search.ExtendedSearchProposition.Selection',2012 'selection': 'instance.web.search.ExtendedSearchProposition.Selection',
2013 'reference': 'instance.web.search.ExtendedSearchProposition.Reference',
19992014
2000 'id': 'instance.web.search.ExtendedSearchProposition.Id'2015 'id': 'instance.web.search.ExtendedSearchProposition.Id'
2001});2016});
20022017
=== modified file 'addons/web/static/src/xml/base.xml'
--- addons/web/static/src/xml/base.xml 2012-11-28 16:03:44 +0000
+++ addons/web/static/src/xml/base.xml 2012-11-29 08:42:25 +0000
@@ -1630,7 +1630,10 @@
1630 </t>1630 </t>
1631 </select>1631 </select>
1632</t>1632</t>
16331633<t t-name="SearchView.extended_search.proposition.reference">
1634 <t t-call="SearchView.extended_search.proposition.selection"/>
1635 <t t-call="SearchView.extended_search.proposition.char"/>
1636</t>
1634<t t-name="ExportView">1637<t t-name="ExportView">
1635 <a id="exportview" href="javascript: void(0)" style="text-decoration: none;color: #3D3D3D;">Export</a>1638 <a id="exportview" href="javascript: void(0)" style="text-decoration: none;color: #3D3D3D;">Export</a>
1636</t>1639</t>