diff options
| author | Xavier Morel <xmo@openerp.com> | 2012-04-06 13:46:33 +0200 |
|---|---|---|
| committer | Xavier Morel <xmo@openerp.com> | 2012-04-06 13:46:33 +0200 |
| commit | dee501948e89dacc089a2cb7a5cb729f917b8953 (patch) | |
| tree | 9d4aad1e86342f9a2cff55f215a165c458c78c9b /addons/web/static/src | |
| parent | 9678b25a9baee4343cc147a21aa74b6756be3058 (diff) | |
[IMP] quick change (to better fix when facets are re-done): make all facets read-only
rco review feedback for essential fixes
bzr revid: xmo@openerp.com-20120406114633-mp0ws7n3d2cokddd
Diffstat (limited to 'addons/web/static/src')
| -rw-r--r-- | addons/web/static/src/js/search.js | 10 | ||||
| -rw-r--r-- | addons/web/static/src/xml/base.xml | 13 |
2 files changed, 16 insertions, 7 deletions
diff --git a/addons/web/static/src/js/search.js b/addons/web/static/src/js/search.js index e63df3d7b9e..399d8007781 100644 --- a/addons/web/static/src/js/search.js +++ b/addons/web/static/src/js/search.js @@ -314,10 +314,12 @@ openerp.web.SearchView = openerp.web.Widget.extend(/** @lends openerp.web.Search * @param {VS.model.SearchFacet} options.model facet object to render */ make_visualsearch_facet: function (options) { - if (options.model.get('field') instanceof openerp.web.search.FilterGroup) { - return new openerp.web.search.FilterGroupFacet(options); - } - return new VS.ui.SearchFacet(options); + return new openerp.web.search.FilterGroupFacet(options); + +// if (options.model.get('field') instanceof openerp.web.search.FilterGroup) { +// return new openerp.web.search.FilterGroupFacet(options); +// } +// return new VS.ui.SearchFacet(options); }, /** * Proxies searches on a SearchInput to the search view's global completion diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml index 30bf8e6ec93..04effdb4fe0 100644 --- a/addons/web/static/src/xml/base.xml +++ b/addons/web/static/src/xml/base.xml @@ -1313,10 +1313,17 @@ <t t-name="SearchView.filters.facet"> <div class="category oe_filter_category"><t t-esc="facet.get('category')"/></div> - <div class="search_facet_input_container" - t-foreach="facet.get('json')" t-as="filter"> - <t t-esc="filter.attrs.string || filter.attrs.name"/> + <t t-set="val" t-value="facet.get('json')"/> + + <div t-if="!(val instanceof Array)" class="search_facet_input_container"> + <t t-esc="facet.get('value')"/> </div> + <t t-if="val instanceof Array"> + <div class="search_facet_input_container" + t-foreach="facet.get('json')" t-as="filter"> + <t t-esc="filter.attrs.string || filter.attrs.name"/> + </div> + </t> <div class="search_facet_remove VS-icon VS-icon-cancel"/> </t> |