From b3d0828564370a97f340b567131425fc8ba9e8c8 Mon Sep 17 00:00:00 2001 From: Xavier Morel Date: Mon, 23 Apr 2012 11:50:57 +0200 Subject: [PATCH 01/81] [FIX] bloody logo link bzr revid: xmo@openerp.com-20120423095057-gytshtkft5002693 --- addons/web/static/src/xml/base.xml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml index 57970c1486e..65c084731bc 100644 --- a/addons/web/static/src/xml/base.xml +++ b/addons/web/static/src/xml/base.xml @@ -275,7 +275,10 @@ - + + d.url = '/' + (window.location.search || ''); + +
Powered by OpenERP From 9046ab46fa7df9dcca66e17380823c55bb87267d Mon Sep 17 00:00:00 2001 From: Xavier Morel Date: Tue, 24 Apr 2012 12:59:41 +0200 Subject: [PATCH 02/81] [WIP] VS-less search view: remove visualsearch, start building coherent model backing to the view bzr revid: xmo@openerp.com-20120424105941-x8dvot5mjruvxcho --- addons/web/__openerp__.py | 16 - addons/web/static/src/css/base.css | 6 +- addons/web/static/src/css/base.sass | 24 +- addons/web/static/src/js/search.js | 442 +++++++++++++--------------- addons/web/static/src/xml/base.xml | 15 + addons/web/static/test/search.js | 143 +++++++++ addons/web/static/test/test.html | 2 + 7 files changed, 389 insertions(+), 259 deletions(-) create mode 100644 addons/web/static/test/search.js diff --git a/addons/web/__openerp__.py b/addons/web/__openerp__.py index 1ca0553c8e2..abcb25647f8 100644 --- a/addons/web/__openerp__.py +++ b/addons/web/__openerp__.py @@ -35,19 +35,6 @@ "static/lib/underscore/underscore.string.js", "static/lib/backbone/backbone.js", - "static/lib/visualsearch/lib/js/visualsearch.js", - "static/lib/visualsearch/lib/js/utils/backbone_extensions.js", - "static/lib/visualsearch/lib/js/utils/hotkeys.js", - "static/lib/visualsearch/lib/js/utils/inflector.js", - "static/lib/visualsearch/lib/js/utils/jquery_extensions.js", - "static/lib/visualsearch/lib/js/utils/search_parser.js", - "static/lib/visualsearch/lib/js/models/search_facets.js", - "static/lib/visualsearch/lib/js/models/search_query.js", - "static/lib/visualsearch/lib/js/templates/templates.js", - "static/lib/visualsearch/lib/js/views/search_facet.js", - "static/lib/visualsearch/lib/js/views/search_input.js", - "static/lib/visualsearch/lib/js/views/search_box.js", - "static/lib/labjs/LAB.src.js", "static/lib/py.js/lib/py.js", "static/src/js/boot.js", @@ -73,9 +60,6 @@ "static/lib/jquery.ui.timepicker/css/jquery-ui-timepicker-addon.css", "static/lib/jquery.ui.notify/css/ui.notify.css", "static/lib/jquery.tipsy/tipsy.css", - "static/lib/visualsearch/lib/css/reset.css", - "static/lib/visualsearch/lib/css/workspace.css", - "static/lib/visualsearch/lib/css/icons.css", # "static/src/css/base_old.css", "static/src/css/base.css", "static/src/css/data_export.css", diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css index 2b90d47c002..1a5136f93e4 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -1048,6 +1048,8 @@ .openerp .oe_searchview { position: relative; float: right; + padding-right: 20px; + background: white; } .openerp .oe_searchview .VS-search .VS-search-box { min-height: 0; @@ -1133,7 +1135,7 @@ .openerp .oe_searchview .VS-search .VS-icon-cancel { right: 24px; } -.openerp .oe_searchview .VS-search .oe_vs_unfold_drawer { +.openerp .oe_searchview .oe_searchview_unfold_drawer { position: absolute; top: 0; right: 0; @@ -1143,7 +1145,7 @@ color: #cccccc; cursor: pointer; } -.openerp .oe_searchview .VS-search .oe_vs_unfold_drawer:before { +.openerp .oe_searchview .oe_searchview_unfold_drawer:before { content: "▾"; } .openerp .oe_searchview.oe_searchview_open_drawer .oe_searchview_drawer { diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index fc645a92e44..ee38da2cc56 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -821,6 +821,8 @@ $colour4: #8a89ba .oe_searchview position: relative float: right + padding-right: 20px + background: white .VS-search .VS-search-box min-height: 0 @@ -908,17 +910,17 @@ $colour4: #8a89ba .VS-icon-cancel right: 24px - .oe_vs_unfold_drawer - position: absolute - top: 0 - right: 0 - height: 100% - line-height: 23px - padding: 0 7px 0 4px - color: #ccc - cursor: pointer - &:before - content: "▾" + .oe_searchview_unfold_drawer + position: absolute + top: 0 + right: 0 + height: 100% + line-height: 23px + padding: 0 7px 0 4px + color: #ccc + cursor: pointer + &:before + content: "▾" &.oe_searchview_open_drawer .oe_searchview_drawer diff --git a/addons/web/static/src/js/search.js b/addons/web/static/src/js/search.js index c2df866b5c6..f37cf1ae60b 100644 --- a/addons/web/static/src/js/search.js +++ b/addons/web/static/src/js/search.js @@ -6,67 +6,143 @@ _.mixin({ sum: function (obj) { return _.reduce(obj, function (a, b) { return a + b; }, 0); } }); -// Have SearchBox optionally use callback function to produce inputs and facets -// (views) set on callbacks.make_facet and callbacks.make_input keys when -// initializing VisualSearch -var SearchBox_renderFacet = function (facet, position) { - var view = new (this.app.options.callbacks['make_facet'] || VS.ui.SearchFacet)({ - app : this.app, - model : facet, - order : position - }); +/** @namespace */ +var my = instance.web.search = {}; - // Input first, facet second. - this.renderSearchInput(); - this.facetViews.push(view); - this.$('.VS-search-inner').children().eq(position*2).after(view.render().el); +my.FacetValue = Backbone.Model.extend({ - view.calculateSize(); - _.defer(_.bind(view.calculateSize, view)); - - return view; - }; // warning: will not match -// Ensure we're replacing the function we think -if (SearchBox_renderFacet.toString() !== VS.ui.SearchBox.prototype.renderFacet.toString().replace(/(VS\.ui\.SearchFacet)/, "(this.app.options.callbacks['make_facet'] || $1)")) { - throw new Error( - "Trying to replace wrong version of VS.ui.SearchBox#renderFacet. " - + "Please fix replacement."); -} -var SearchBox_renderSearchInput = function () { - var input = new (this.app.options.callbacks['make_input'] || VS.ui.SearchInput)({position: this.inputViews.length, app: this.app}); - this.$('.VS-search-inner').append(input.render().el); - this.inputViews.push(input); - }; -// Ensure we're replacing the function we think -if (SearchBox_renderSearchInput.toString() !== VS.ui.SearchBox.prototype.renderSearchInput.toString().replace(/(VS\.ui\.SearchInput)/, "(this.app.options.callbacks['make_input'] || $1)")) { - throw new Error( - "Trying to replace wrong version of VS.ui.SearchBox#renderSearchInput. " - + "Please fix replacement."); -} -var SearchBox_searchEvent = function (e) { - var query = null; - this.renderFacets(); - this.focusSearch(e); - this.app.options.callbacks.search(query, this.app.searchQuery); - }; -if (SearchBox_searchEvent.toString() !== VS.ui.SearchBox.prototype.searchEvent.toString().replace( - /this\.value\(\);\n[ ]{4}this\.focusSearch\(e\);\n[ ]{4}this\.value\(query\)/, - 'null;\n this.renderFacets();\n this.focusSearch(e)')) { - throw new Error( - "Trying to replace wrong version of VS.ui.SearchBox#searchEvent. " - + "Please fix replacement."); -} -_.extend(VS.ui.SearchBox.prototype, { - renderFacet: SearchBox_renderFacet, - renderSearchInput: SearchBox_renderSearchInput, - searchEvent: SearchBox_searchEvent }); -_.extend(VS.model.SearchFacet.prototype, { - value: function () { - if (this.has('json')) { - return this.get('json'); +my.FacetValues = Backbone.Collection.extend({ + model: my.FacetValue +}); +my.Facet = Backbone.Model.extend({ + initialize: function (attrs) { + var values = attrs.values; + delete attrs.values; + + Backbone.Model.prototype.initialize.apply(this, arguments); + + this.values = new my.FacetValues(values || []); + this.values.on('add remove change reset', function () { + this.trigger('change', this); + }, this); + }, + get: function (key) { + if (key !== 'values') { + return Backbone.Model.prototype.get.call(this, key); } - return this.get('value'); + return this.values.toJSON(); + }, + set: function (key, value) { + if (key !== 'values') { + return Backbone.Model.prototype.set.call(this, key, value); + } + this.values.reset(value); + } +}); +my.SearchQuery = Backbone.Collection.extend({ + model: my.Facet, + initialize: function () { + Backbone.Collection.prototype.initialize.apply( + this, arguments); + this.on('change', function (facet) { + if(!facet.values.isEmpty()) { return; } + + this.remove(facet); + }, this); + }, + add: function (value, options) { + options || (options = {}); + if (value instanceof Array) { + throw new Error("Can't add multiple facets to a query at once"); + } + var model = this._prepareModel(value, options); + var previous = this.detect(function (facet) { + return facet.get('category') === model.get('category') + && facet.get('field') === model.get('field'); + }); + if (previous) { + previous.values.add(model.get('values')); + return this; + } + return Backbone.Collection.prototype.add.call(this, model, options); + }, + toggle: function (value, options) { + options || (options = {}); + + var facet = this.detect(function (facet) { + return facet.get('category') === value.category + && facet.get('field') === value.field; + }); + if (!facet) { + return this.add(value, options); + } + + var changed = false; + _(value.values).each(function (val) { + var already_value = facet.values.detect(function (v) { + return v.get('value') === val.value + && v.get('label') === val.label; + }); + // toggle value + if (already_value) { + facet.values.remove(already_value, {silent: true}); + } else { + facet.values.add(val, {silent: true}); + } + changed = true; + }); + // "Commit" changes to values array as a single call, so observers of + // change event don't get misled by intermediate incomplete toggling + // states + facet.trigger('change', facet); + return this; + } +}); + +my.InputView = instance.web.Widget.extend({ + template: 'SearchView.InputView' +}); +my.FacetView = instance.web.Widget.extend({ + template: 'SearchView.FacetView', + init: function (parent, model) { + this._super(parent); + this.model = model; + this.model.on('change', this.model_changed, this); + }, + destroy: function () { + this.model.off('change', this.model_changed, this); + this._super(); + }, + start: function () { + var self = this; + var $e = self.$element.find('span'); + var q = $.when(this._super()); + return q.pipe(function () { + var values = self.model.values.map(function (value) { + return new my.FacetValueView(self, value).appendTo($e); + }); + + return $.when.apply(null, values); + }); + }, + model_changed: function () { + this.$element.text(this.$element.text() + '*'); + } +}); +my.FacetValueView = instance.web.Widget.extend({ + template: 'SearchView.FacetView.Value', + init: function (parent, model) { + this._super(parent); + this.model = model; + this.model.on('change', this.model_changed, this); + }, + destroy: function () { + this.model.off('change', this.model_changed, this); + this._super(); + }, + model_changed: function () { + this.$element.text(this.$element.text() + '*'); } }); @@ -74,13 +150,13 @@ instance.web.SearchView = instance.web.Widget.extend(/** @lends instance.web.Sea template: "SearchView", /** * @constructs instance.web.SearchView - * @extends instance.web.OldWidget + * @extends instance.web.Widget * * @param parent - * @param element_id * @param dataset * @param view_id * @param defaults + * @param hidden */ init: function(parent, dataset, view_id, defaults, hidden) { this._super(parent); @@ -99,6 +175,8 @@ instance.web.SearchView = instance.web.Widget.extend(/** @lends instance.web.Sea this.filter_data = {}; + this.input_subviews = []; + this.ready = $.Deferred(); }, start: function() { @@ -106,34 +184,16 @@ instance.web.SearchView = instance.web.Widget.extend(/** @lends instance.web.Sea var p = this._super(); this.setup_global_completion(); - this.vs = VS.init({ - container: this.$element, - query: '', - callbacks: { - make_facet: this.proxy('make_visualsearch_facet'), - make_input: this.proxy('make_visualsearch_input'), - search: function (query, searchCollection) { - self.do_search(); - }, - facetMatches: function (callback) { - }, - valueMatches : function(facet, searchTerm, callback) { - } + this.query = new my.SearchQuery() + .on('add change reset', this.proxy('do_search')) + .on('add change reset', this.proxy('renderFacets')) + .on('remove', function (record, collection, options) { + self.renderFacets(); + if (options.trigger_search) { + self.do_search(); } }); - var search = function () { self.vs.searchBox.searchEvent({}); }; - // searchQuery operations - this.vs.searchQuery - .off('add').on('add', search) - .off('change').on('change', search) - .off('reset').on('reset', search) - .off('remove').on('remove', function (record, collection, options) { - if (options['trigger_search']) { - search(); - } - }); - if (this.hidden) { this.$element.hide(); } @@ -154,7 +214,7 @@ instance.web.SearchView = instance.web.Widget.extend(/** @lends instance.web.Sea .then(this.on_loaded); } - this.$element.on('click', '.oe_vs_unfold_drawer', function () { + this.$element.on('click', '.oe_searchview_unfold_drawer', function () { self.$element.toggleClass('oe_searchview_open_drawer'); }); @@ -172,7 +232,7 @@ instance.web.SearchView = instance.web.Widget.extend(/** @lends instance.web.Sea */ setup_stuff_drawer: function () { var self = this; - $('
').appendTo(this.$element.find('.VS-search-box')); + $('
').appendTo(this.$element); var $drawer = $('
').appendTo(this.$element); var $filters = $('
').appendTo($drawer); @@ -301,50 +361,28 @@ instance.web.SearchView = instance.web.Widget.extend(/** @lends instance.web.Sea */ select_completion: function (e, ui) { e.preventDefault(); - this.vs.searchQuery.add(new VS.model.SearchFacet(_.extend( - {app: this.vs}, ui.item))); - this.vs.searchBox.searchEvent({}); - }, - /** - * Builds the right SearchFacet view based on the facet object to render - * (e.g. readonly facets for filters) - * - * @param {Object} options - * @param {VS.model.SearchFacet} options.model facet object to render - */ - make_visualsearch_facet: function (options) { - return new instance.web.search.FilterGroupFacet(options); - -// if (options.model.get('field') instanceof instance.web.search.FilterGroup) { -// return new instance.web.search.FilterGroupFacet(options); -// } -// return new VS.ui.SearchFacet(options); + // FIXME: could have multiple values, shitty API + this.query.add_value(ui.item.category, ui.item.values[0]); }, - /** - * Proxies searches on a SearchInput to the search view's global completion - * - * Also disables SearchInput.autocomplete#_move so search view's - * autocomplete can get the corresponding events, or something. - * - * @param options - */ - make_visualsearch_input: function (options) { - var self = this, input = new VS.ui.SearchInput(options); - input.setupAutocomplete = function () { - _.extend(this.box.autocomplete({ - minLength: 1, - delay: 0, - search: function () { - self.$element.autocomplete('search', input.box.val()); - return false; - } - }).data('autocomplete'), { - _move: function () {}, - close: function () { self.$element.autocomplete('close'); } - }); - }; - return input; + renderFacets: function () { + var self = this; + var $e = this.$element.find('div.oe_searchview_facets'); + _.invoke(this.input_subviews, 'destroy'); + this.input_subviews = []; + + var i = new my.InputView(this); + i.appendTo($e); + this.input_subviews.push(i); + this.query.each(function (facet) { + var f = new my.FacetView(this, facet); + f.appendTo($e); + self.input_subviews.push(f); + + var i = new my.InputView(this); + i.appendTo($e); + self.input_subviews.push(i); + }, this); }, /** @@ -428,8 +466,8 @@ instance.web.SearchView = instance.web.Widget.extend(/** @lends instance.web.Sea this.setup_stuff_drawer(), $.when.apply(null, _(this.inputs).invoke('facet_for_defaults', this.defaults)) .then(function () { - self.vs.searchQuery.reset(_(arguments).compact(), {silent: true}); - self.vs.searchBox.renderFacets(); + self.query.reset(_(arguments).compact(), {silent: true}); + self.renderFacets(); })) .then(function () { self.ready.resolve(); }) }, @@ -583,7 +621,8 @@ instance.web.SearchView = instance.web.Widget.extend(/** @lends instance.web.Sea do_search: function () { var domains = [], contexts = [], groupbys = [], errors = []; - this.vs.searchQuery.each(function (facet) { + return this.on_search([], [], []); + this.query.each(function (facet) { var field = facet.get('field'); try { var domain = field.get_domain(facet); @@ -647,40 +686,6 @@ instance.web.SearchView = instance.web.Widget.extend(/** @lends instance.web.Sea } }); -/** @namespace */ -instance.web.search = {}; - -instance.web.search.FilterGroupFacet = VS.ui.SearchFacet.extend({ - events: _.extend({ - 'click': 'selectFacet' - }, VS.ui.SearchFacet.prototype.events), - - render: function () { - this.setMode('not', 'editing'); - this.setMode('not', 'selected'); - - var value = this.model.get('value'); - this.$el.html(QWeb.render('SearchView.filters.facet', { - facet: this.model - })); - // virtual input so SearchFacet code has something to play with - this.box = $('').val(value); - - return this; - }, - enableEdit: function () { - this.selectFacet() - }, - keydown: function (e) { - var key = VS.app.hotkeys.key(e); - if (key !== 'right') { - return VS.ui.SearchFacet.prototype.keydown.call(this, e); - } - e.preventDefault(); - this.deselectFacet(); - this.options.app.searchBox.focusNextFacet(this, 1); - } -}); /** * Registry of search fields, called by :js:class:`instance.web.SearchView` to * find and instantiate its field widgets. @@ -780,8 +785,8 @@ instance.web.search.Input = instance.web.search.Widget.extend( /** @lends instan return $.when(null) }, /** - * Returns a VS.model.SearchFacet instance for the provided defaults if - * they apply to this widget, or null if they don't. + * Returns a Facet instance for the provided defaults if they apply to + * this widget, or null if they don't. * * This default implementation will try calling * :js:func:`instance.web.search.Input#facet_for` if the widget's name @@ -845,14 +850,11 @@ instance.web.search.FilterGroup = instance.web.search.Input.extend(/** @lends in return f.attrs && f.attrs.name && !!defaults[f.attrs.name]; }); if (_.isEmpty(fs)) { return $.when(null); } - return $.when(new VS.model.SearchFacet({ + return $.when({ category: _t("Filter"), - value: _(fs).map(function (f) { - return f.attrs.string || f.attrs.name }).join(' | '), - json: fs, - field: this, - app: this.view.vs - })); + values: fs, + field: this + }); }, /** * Fetches contexts for all enabled filters in the group @@ -861,7 +863,7 @@ instance.web.search.FilterGroup = instance.web.search.Input.extend(/** @lends in * @return {*} combined contexts of the enabled filters in this group */ get_context: function (facet) { - var contexts = _(facet.get('json')).chain() + var contexts = _(facet.get('values')).chain() .map(function (filter) { return filter.attrs.context; }) .reject(_.isEmpty) .value(); @@ -879,7 +881,7 @@ instance.web.search.FilterGroup = instance.web.search.Input.extend(/** @lends in * @return {Array} enabled filters in this group */ get_groupby: function (facet) { - return _(facet.get('json')).chain() + return _(facet.get('values')).chain() .map(function (filter) { return filter.attrs.context; }) .reject(_.isEmpty) .value(); @@ -891,7 +893,7 @@ instance.web.search.FilterGroup = instance.web.search.Input.extend(/** @lends in * @return {*} combined domains of the enabled filters in this group */ get_domain: function (facet) { - var domains = _(facet.get('json')).chain() + var domains = _(facet.get('values')).chain() .map(function (filter) { return filter.attrs.domain; }) .reject(_.isEmpty) .value(); @@ -911,10 +913,10 @@ instance.web.search.FilterGroup = instance.web.search.Input.extend(/** @lends in toggle: function (filter) { // FIXME: oh god, my eyes, they hurt var self = this, fs; - var facet = this.view.vs.searchQuery.detect(function (f) { + var facet = this.view.query.detect(function (f) { return f.get('field') === self; }); if (facet) { - fs = facet.get('json'); + fs = facet.get('values'); if (_.include(fs, filter)) { fs = _.without(fs, filter); @@ -922,12 +924,10 @@ instance.web.search.FilterGroup = instance.web.search.Input.extend(/** @lends in fs.push(filter); } if (_(fs).isEmpty()) { - this.view.vs.searchQuery.remove(facet, {trigger_search: true}); + this.view.query.remove(facet, {trigger_search: true}); } else { facet.set({ - json: fs, - value: _(fs).map(function (f) { - return f.attrs.string || f.attrs.name }).join(' | ') + values: fs }); } return; @@ -935,13 +935,10 @@ instance.web.search.FilterGroup = instance.web.search.Input.extend(/** @lends in fs = [filter]; } - this.view.vs.searchQuery.add({ + this.view.query.add({ category: _t("Filter"), - value: _(fs).map(function (f) { - return f.attrs.string || f.attrs.name }).join(' | '), - json: fs, - field: this, - app: this.view.vs + values: fs, + field: this }); } }); @@ -985,13 +982,10 @@ instance.web.search.Field = instance.web.search.Input.extend( /** @lends instanc this.load_attrs(_.extend({}, field, view_section.attrs)); }, facet_for: function (value) { - return $.when(new VS.model.SearchFacet({ + return $.when({ category: this.attrs.string || this.attrs.name, - value: String(value), - json: value, - field: this, - app: this.view.vs - })); + values: [{label: String(value), value: value}] + }); }, get_value: function (facet) { return facet.value(); @@ -1061,8 +1055,7 @@ instance.web.search.CharField = instance.web.search.Field.extend( /** @lends ins return $.when([{ category: this.attrs.string, label: label, - value: value, - field: this + value: [{label: label, value: value}] }]); } }); @@ -1142,11 +1135,11 @@ instance.web.search.SelectionField = instance.web.search.Field.extend(/** @lends return label.toLowerCase().indexOf(needle.toLowerCase()) !== -1; }) .map(function (sel) { + // FIXME fucking repetition man, find something better return { category: self.attrs.string, - field: self, value: sel[1], - json: sel[0] + values: [{value: sel[0], label: sel[1]}] }; }).value(); if (_.isEmpty(results)) { return $.when(null); } @@ -1159,16 +1152,14 @@ instance.web.search.SelectionField = instance.web.search.Field.extend(/** @lends return sel[0] === value; }); if (!match) { return $.when(null); } - return $.when(new VS.model.SearchFacet({ + return $.when({ category: this.attrs.string, value: match[1], - json: match[0], - field: this, - app: this.view.app - })); + values: [{label: match[1], value: match[0]}] + }); }, get_value: function (facet) { - return facet.get('json'); + return facet.get('values'); } }); instance.web.search.BooleanField = instance.web.search.SelectionField.extend(/** @lends instance.web.search.BooleanField# */{ @@ -1197,7 +1188,7 @@ instance.web.search.BooleanField = instance.web.search.SelectionField.extend(/** */ instance.web.search.DateField = instance.web.search.Field.extend(/** @lends instance.web.search.DateField# */{ get_value: function (facet) { - return instance.web.date_to_str(facet.get('json')); + return openerp.web.date_to_str(facet.get('values')); }, complete: function (needle) { var d = Date.parse(needle); @@ -1210,9 +1201,8 @@ instance.web.search.DateField = instance.web.search.Field.extend(/** @lends inst return $.when([{ category: this.attrs.string, label: label, - value: value, - json: d, - field: this + // FIXME: brain broken + values: [{label: value, value: d}] }]); } }); @@ -1229,7 +1219,7 @@ instance.web.search.DateField = instance.web.search.Field.extend(/** @lends inst */ instance.web.search.DateTimeField = instance.web.search.DateField.extend(/** @lends instance.web.search.DateTimeField# */{ get_value: function (facet) { - return instance.web.datetime_to_str(facet.get('json')); + return openerp.web.datetime_to_str(facet.get('values')); } }); instance.web.search.ManyToOneField = instance.web.search.CharField.extend({ @@ -1252,8 +1242,7 @@ instance.web.search.ManyToOneField = instance.web.search.CharField.extend({ return { category: self.attrs.string, value: result[1], - json: result[0], - field: self + values: [{label: result[1], value: result[0]}] }; })); }); @@ -1261,28 +1250,24 @@ instance.web.search.ManyToOneField = instance.web.search.CharField.extend({ facet_for: function (value) { var self = this; if (value instanceof Array) { - return $.when(new VS.model.SearchFacet({ + return $.when({ category: this.attrs.string, value: value[1], - json: value[0], - field: this, - app: this.view.vs - })); + values: [{label: value[1], value: value[0]}] + }); } return this.model.call('name_get', [value], {}).pipe(function (names) { - return new VS.model.SearchFacet({ + return { category: self.attrs.string, value: names[0][1], - json: names[0][0], - field: self, - app: self.view.vs - }); + values: [{label: names[0][1], value: names[0][0]}] + }; }) }, make_domain: function (name, operator, facet) { // ``json`` -> actual auto-completed id - if (facet.get('json')) { - return [[name, '=', facet.get('json')]]; + if (facet.get('values')) { + return [[name, '=', facet.get('values')]]; } return this._super(name, operator, facet); @@ -1332,13 +1317,10 @@ instance.web.search.Advanced = instance.web.search.Input.extend({ // Create Filter (& FilterGroup around it) with that domain var f = new instance.web.search.FilterGroup(filters, this.view); // add group to query - this.view.vs.searchQuery.add({ + this.query.add({ category: _t("Advanced"), - value: _(filters).map(function (f) { - return f.attrs.string || f.attrs.name }).join(' | '), - json: filters, - field: f, - app: this.view.vs + values: filters, + field: f }); // remove all propositions _.invoke(children, 'destroy'); diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml index 65c084731bc..fcdf68a12ca 100644 --- a/addons/web/static/src/xml/base.xml +++ b/addons/web/static/src/xml/base.xml @@ -1290,7 +1290,22 @@
+
+ +
+
+ : +
+ + + + diff --git a/addons/web/static/test/search.js b/addons/web/static/test/search.js new file mode 100644 index 00000000000..c8d23caf49c --- /dev/null +++ b/addons/web/static/test/search.js @@ -0,0 +1,143 @@ +$(document).ready(function () { + var instance; + module('query', { + setup: function () { + instance = window.openerp.init([]); + window.openerp.web.corelib(instance); + window.openerp.web.coresetup(instance); + window.openerp.web.chrome(instance); + window.openerp.web.data(instance); + window.openerp.web.search(instance); + } + }); + test('Adding a facet to the query creates a facet and a value', function () { + var query = new instance.web.search.SearchQuery; + var field = {}; + query.add({ + category: 'Foo', + field: field, + values: [{label: 'Value', value: 3}] + }); + + var facet = query.at(0); + equal(facet.get('category'), 'Foo'); + equal(facet.get('field'), field); + deepEqual(facet.get('values'), [{label: 'Value', value: 3}]); + }); + test('Adding an array of facet is not valid', function () { + var query = new instance.web.search.SearchQuery; + + raises(function () { + query.add([ + { category: 'Foo', field: {}, values: [{label: 'Value', value: 3}] }, + { category: 'Bar', field: {}, values: [{label: 'Value 2', value: 4}] } + ]); + }); + }); + test('If a facet already exists, add values to it', function () { + var query = new instance.web.search.SearchQuery; + var field = {}; + query.add({category: 'A', field: field, values: [{label: 'V1', value: 0}]}); + query.add({category: 'A', field: field, values: [{label: 'V2', value: 1}]}); + + equal(query.length, 1, "adding an existing facet should merge new values into old facet"); + var facet = query.at(0); + deepEqual(facet.get('values'), [ + {label: 'V1', value: 0}, + {label: 'V2', value: 1} + ]); + }); + test('Facet being implicitly changed should trigger change, not add', function () { + var query = new instance.web.search.SearchQuery; + var field = {}, added = false, changed = false; + query.add({category: 'A', field: field, values: [{label: 'V1', value: 0}]}); + query.on('add', function () { added = true; }) + .on('change', function () { changed = true }); + query.add({category: 'A', field: field, values: [{label: 'V2', value: 1}]}); + + ok(!added, "query.add adding values to a facet should not trigger an add"); + ok(changed, "query.add adding values to a facet should not trigger a change"); + }); + test('Toggling a facet, value which does not exist should add it', function () { + var query = new instance.web.search.SearchQuery; + var field = {}; + query.toggle({category: 'A', field: field, values: [{label: 'V1', value: 0}]}); + + equal(query.length, 1, "Should have created a single facet"); + var facet = query.at(0); + equal(facet.values.length, 1, "Facet should have a single value"); + deepEqual(facet.get('values'), [{label: 'V1', value: 0}], + "Facet's value should match input"); + }); + test('Toggling a facet which exists with a value which does not should add the value to the facet', function () { + var field = {}; + var query = new instance.web.search.SearchQuery; + query.add({category: 'A', field: field, values: [{label: 'V1', value: 0}]}); + query.toggle({category: 'A', field: field, values: [{label: 'V2', value: 1}]}); + + equal(query.length, 1, "Should have edited the existing facet"); + var facet = query.at(0); + equal(facet.values.length, 2, "Should have added the value to the existing facet"); + deepEqual(facet.get('values'), [ + {label: 'V1', value: 0}, + {label: 'V2', value: 1} + ]); + }); + test('Toggling a facet which exists with a value which does as well should remove the value from the facet', function () { + var field = {}; + var query = new instance.web.search.SearchQuery; + query.add({category: 'A', field: field, values: [{label: 'V1', value: 0}]}); + query.add({category: 'A', field: field, values: [{label: 'V2', value: 1}]}); + + query.toggle({category: 'A', field: field, values: [{label: 'V2', value: 1}]}); + + equal(query.length, 1, 'Should have the same single facet'); + var facet = query.at(0); + equal(facet.values.length, 1, "Should only have one value left in the facet"); + deepEqual(facet.get('values'), [ + {label: 'V1', value: 0} + ]); + }); + test('Toggling off the last value of a facet should remove the facet', function () { + var field = {}; + var query = new instance.web.search.SearchQuery; + query.add({category: 'A', field: field, values: [{label: 'V1', value: 0}]}); + + query.toggle({category: 'A', field: field, values: [{label: 'V1', value: 0}]}); + + equal(query.length, 0, 'Should have removed the facet'); + }); + test('Intermediate emptyness should not remove the facet', function () { + var field = {}; + var query = new instance.web.search.SearchQuery; + query.add({category: 'A', field: field, values: [{label: 'V1', value: 0}]}); + + query.toggle({category: 'A', field: field, values: [ + {label: 'V1', value: 0}, + {label: 'V2', value: 1} + ]}); + + equal(query.length, 1, 'Should not have removed the facet'); + var facet = query.at(0); + equal(facet.values.length, 1, "Should have one value"); + deepEqual(facet.get('values'), [ + {label: 'V2', value: 1} + ]); + }); + // TODO: if the last FacetValue of a facet is removed, the facet should be removed from the query + + test('Reseting with multiple facets should still work to load defaults', function () { + var query = new instance.web.search.SearchQuery; + var field = {}; + query.reset([ + {category: 'A', field: field, values: [{label: 'V1', value: 0}]}, + {category: 'B', field: field, values: [{label: 'V2', value: 1}]}]); + + equal(query.length, 1, 'Should have created a single facet'); + equal(query.at(0).values.length, 2, 'the facet should have merged two values'); + deepEqual(query.at(0).get('values'), [ + {label: 'V1', value: 0}, + {label: 'V2', value: 1} + ]) + }); +}); diff --git a/addons/web/static/test/test.html b/addons/web/static/test/test.html index 84dd3ee7f27..cc1916399f3 100644 --- a/addons/web/static/test/test.html +++ b/addons/web/static/test/test.html @@ -10,6 +10,7 @@ + @@ -53,4 +54,5 @@ + From 595eec05a6e241518bcc4bb82aa5fe0dc000a425 Mon Sep 17 00:00:00 2001 From: Xavier Morel Date: Tue, 24 Apr 2012 14:38:24 +0200 Subject: [PATCH 03/81] [FIX] make SearchQuery#add(Array) work correctly (fixing #reset at the same time) bzr revid: xmo@openerp.com-20120424123824-x3nsecztz9gsiar4 --- addons/web/static/src/js/search.js | 30 +++++++++++++++++------------- addons/web/static/test/search.js | 20 ++++++++++---------- 2 files changed, 27 insertions(+), 23 deletions(-) diff --git a/addons/web/static/src/js/search.js b/addons/web/static/src/js/search.js index f37cf1ae60b..4c1862365ca 100644 --- a/addons/web/static/src/js/search.js +++ b/addons/web/static/src/js/search.js @@ -51,21 +51,25 @@ my.SearchQuery = Backbone.Collection.extend({ this.remove(facet); }, this); }, - add: function (value, options) { + add: function (values, options) { options || (options = {}); - if (value instanceof Array) { - throw new Error("Can't add multiple facets to a query at once"); + if (!(values instanceof Array)) { + values = [values]; } - var model = this._prepareModel(value, options); - var previous = this.detect(function (facet) { - return facet.get('category') === model.get('category') - && facet.get('field') === model.get('field'); - }); - if (previous) { - previous.values.add(model.get('values')); - return this; - } - return Backbone.Collection.prototype.add.call(this, model, options); + + _(values).each(function (value) { + var model = this._prepareModel(value, options); + var previous = this.detect(function (facet) { + return facet.get('category') === model.get('category') + && facet.get('field') === model.get('field'); + }); + if (previous) { + previous.values.add(model.get('values')); + return; + } + Backbone.Collection.prototype.add.call(this, model, options); + }, this); + return this; }, toggle: function (value, options) { options || (options = {}); diff --git a/addons/web/static/test/search.js b/addons/web/static/test/search.js index c8d23caf49c..7403afb5d0d 100644 --- a/addons/web/static/test/search.js +++ b/addons/web/static/test/search.js @@ -24,15 +24,16 @@ $(document).ready(function () { equal(facet.get('field'), field); deepEqual(facet.get('values'), [{label: 'Value', value: 3}]); }); - test('Adding an array of facet is not valid', function () { + test('Adding two facets', function () { var query = new instance.web.search.SearchQuery; + query.add([ + { category: 'Foo', field: {}, values: [{label: 'Value', value: 3}] }, + { category: 'Bar', field: {}, values: [{label: 'Value 2', value: 4}] } + ]); - raises(function () { - query.add([ - { category: 'Foo', field: {}, values: [{label: 'Value', value: 3}] }, - { category: 'Bar', field: {}, values: [{label: 'Value 2', value: 4}] } - ]); - }); + equal(query.length, 2); + equal(query.at(0).values.length, 1); + equal(query.at(1).values.length, 1); }); test('If a facet already exists, add values to it', function () { var query = new instance.web.search.SearchQuery; @@ -107,7 +108,7 @@ $(document).ready(function () { equal(query.length, 0, 'Should have removed the facet'); }); - test('Intermediate emptyness should not remove the facet', function () { + test('Intermediate emptiness should not remove the facet', function () { var field = {}; var query = new instance.web.search.SearchQuery; query.add({category: 'A', field: field, values: [{label: 'V1', value: 0}]}); @@ -124,14 +125,13 @@ $(document).ready(function () { {label: 'V2', value: 1} ]); }); - // TODO: if the last FacetValue of a facet is removed, the facet should be removed from the query test('Reseting with multiple facets should still work to load defaults', function () { var query = new instance.web.search.SearchQuery; var field = {}; query.reset([ {category: 'A', field: field, values: [{label: 'V1', value: 0}]}, - {category: 'B', field: field, values: [{label: 'V2', value: 1}]}]); + {category: 'A', field: field, values: [{label: 'V2', value: 1}]}]); equal(query.length, 1, 'Should have created a single facet'); equal(query.at(0).values.length, 2, 'the facet should have merged two values'); From 6754110eb7c0415584d2998b89273f36a79b0be1 Mon Sep 17 00:00:00 2001 From: Xavier Morel Date: Tue, 24 Apr 2012 18:07:59 +0200 Subject: [PATCH 04/81] [IMP] get started on doc for VS-less searchview bzr revid: xmo@openerp.com-20120424160759-aghh2pzioy1k4yw4 --- doc/conf.py | 1 + doc/index.rst | 4 +- doc/search-view.rst | 149 +++++++++++++++++++++++++++++++++++++++----- 3 files changed, 135 insertions(+), 19 deletions(-) diff --git a/doc/conf.py b/doc/conf.py index 69e49d0e5a7..a5ff6bed7e1 100644 --- a/doc/conf.py +++ b/doc/conf.py @@ -247,6 +247,7 @@ texinfo_documents = [ # How to display URL addresses: 'footnote', 'no', or 'inline'. #texinfo_show_urls = 'footnote' +todo_include_todos = True # Example configuration for intersphinx: refer to the Python standard library. intersphinx_mapping = { diff --git a/doc/index.rst b/doc/index.rst index 888ff7705f2..9f54b879acc 100644 --- a/doc/index.rst +++ b/doc/index.rst @@ -16,14 +16,14 @@ Contents: async rpc + search-view + Older stuff ----------- .. toctree:: :maxdepth: 2 - search-view - getting-started production widgets diff --git a/doc/search-view.rst b/doc/search-view.rst index 89051884596..4675649a805 100644 --- a/doc/search-view.rst +++ b/doc/search-view.rst @@ -13,21 +13,128 @@ multiple fields). The goal for this change is twofold: * Improve the looks and behaviors of the view, and the fit within OpenERP Web's new design. -The faceted search is implemented through a monkey-patched -`VisualSearch `_ -[#]_. VisualSearch is based on `Backbone +The internal structure of the faceted search is inspired by +`VisualSearch `_ [#]_. + +As does VisualSearch, the new search view is based on `Backbone `_ and makes significant -use of Backbone's models and views. As a result, understanding the -implementation of the OpenERP Web 6.2 search view also requires a -basic understanding of Backbone. +use of Backbone's models and collections (OpenERP Web's widgets make a +good replacement for Backbone's own views). As a result, understanding +the implementation details of the OpenERP Web 7 search view also +requires a basic understanding of Backbone's models, collections and +events. .. note:: This document may mention *fetching* data. This is a shortcut for - "returning a deferred to [whatever is being fetched]". Unless - further noted, the function or method may opt to return nothing by - fetching ``null`` (which can easily be done by returning - ``$.when(null)``, which simply wraps the ``null`` in a Deferred). + "returning a :js:class:`Deferred` to [whatever is being + fetched]". Unless further noted, the function or method may opt to + return nothing by fetching ``null`` (which can easily be done by + returning ``$.when(null)``, which simply wraps the ``null`` in a + Deferred). + +Working with the search view: creating new inputs +------------------------------------------------- + +The primary component of search views, as with all other OpenERP +views, are inputs. The search view has two types of inputs — filters +and fields — but only one is easly customizable: fields. + +The mapping from OpenERP field types (and widgets) to search view +objects is stored in the ``openerp.web.search.fields`` +:js:class:`~openerp.web.Registry` where new field types and widgets +can be added. + +Search view inputs have three main roles: + +Loading defaults +++++++++++++++++ + +Once the search view has initialized all its inputs, it will call +:js:func:`~openerp.web.search.Input.facet_for_defaults` on each input, +passing it a mapping (a javascript object) of ``name:value`` extracted +from the action's context. + +This method should fetch a :js:class:`~openerp.web.search.Facet` (or +an equivalent object) for the field's default value if applicable (if +a default value for the field is found in the ``defaults`` mapping). + +A default implementation is provided which checks if ``defaults`` +contains a non-falsy value for the field's ``@name`` and calls +:js:func:`openerp.web.search.Input.facet_for` with that value. + +There is no default implementation of +:js:func:`openerp.web.search.Input.facet_for` [#]_, but +:js:class:`openerp.web.search.Field` provides one, which uses the +value as-is to fetch a :js:class:`~openerp.web.search.Facet`. + +Providing completions ++++++++++++++++++++++ + +An important component of the new search view is the auto-completion +pane, and the task of providing completion items is delegated to +inputs through the :js:func:`~openerp.web.search.Input.complete` +method. + +This method should take a single argument (the string being typed by +the user) and should fetch an ``Array`` of possible completions [#]_. + +A default implementation is provided which fetches nothing. + +A completion item is an object literal with two keys: + +``label`` + + The string which will be displayed in the completion pane. It may + be formatted using HTML (inline only), as a result if ``value`` is + interpolated into it it *must* be escaped. ``_.escape`` can be + used for this. + +``facet`` + + Either a :js:class:`~openerp.web.search.Facet` object or (more + commonly) the corresponding attributes object. This is the facet + which will be inserted into the search query if the completion + item is selected by the user. + +If the ``facet`` is not provided (not present, ``null``, ``undefined`` +or any other falsy value), the completion item will not be selectable +and will act as a section title of sort (the ``label`` will be +formatted differently). If an input *may* fetch multiple completion +items, it *should* prefix those with a section title using its own +name. This has no technical consequence but is clearer for users. + +Providing drawer/supplementary UI ++++++++++++++++++++++++++++++++++ + +For some inputs (fields or not), interaction via autocompletion may be +awkward or even impossible. + +These may opt to being rendered in a "drawer" as well or instead. In +that case, they will undergo the normal widget lifecycle and be +rendered inside the drawer. + +.. Found no good type-based way to handle this, since there is no MI + (so no type-tagging) and it's possible for both Field and non-Field + input to be put into the drawer, for whatever reason (e.g. some + sort of auto-detector completion item for date widgets, but a + second more usual calendar widget in the drawer for more + obvious/precise interactions) + +Any input can note its desire to be rendered in the drawer by setting +its :js:attr:`~openerp.web.search.Input.in_drawer` attribute to +``true``, either on its class or on its instance. + +It will be rendered in the full width of the drawer, and instantiated +only once. + +.. todo:: drawer API (if a widget wants to close the drawer in some + way), part of the low-level SearchView API/interactions? + + +.. todo:: handle filters and filter groups via a "driver" input which + dynamically collects, lays out and renders filters? => + exercises drawer thingies Interaction between the Search View and VisualSearch ---------------------------------------------------- @@ -197,7 +304,7 @@ Converting from facet objects Ultimately, the point of the search view is to allow searching. In OpenERP this is done via :ref:`domains `. On -the other hand, the OpenERP Web 6.2 search view's state is modelled +the other hand, the OpenERP Web 7 search view's state is modelled after a collection of :js:class:`~VS.model.SearchFacet`, and each field of a search view may have special requirements when it comes to the domains it produces [#]_. @@ -223,7 +330,7 @@ Changes .. todo:: merge in changelog instead The displaying of the search view was significantly altered from -OpenERP Web 6.1 to OpenERP Web 6.2. +OpenERP Web 6.1 to OpenERP Web 7. As a result, while the external API used to interact with the search view does not change many internal details — including the interaction @@ -247,7 +354,7 @@ Widgets API * :js:func:`~openerp.web.search.Input.clear` has been removed since clearing the search view now simply consists of removing all search - facets from VisualSearch + facets * :js:func:`~openerp.web.search.Input.get_domain` and :js:func:`~openerp.web.search.Input.get_context` now take a @@ -300,10 +407,18 @@ Many To One :js:func:`openerp.web.search.ManyToOneField.setup_autocomplete` has been removed. -.. [#] the library code is untouched, all patching is performed in the - Search view's implementation module. Changes to the - VisualSearch code should only update the library to new - revisions or releases. +.. [#] the original view was implemented on top of a monkey-patched + VisualSearch, but as our needs diverged from VisualSearch's goal this + made less and less sense ultimately leading to a clean-room + reimplementation + +.. [#] In case you are extending the search view with a brand new type + of input + +.. [#] Ideally this array should not hold more than about 10 items, + but the search view does not put any constraint on this at the + moment. Note that this may change. + .. [#] search view fields may also bundle context data to add to the search context From 611adc838f6c790b99ea49e12f2c523142d51b29 Mon Sep 17 00:00:00 2001 From: Xavier Morel Date: Wed, 25 Apr 2012 14:20:56 +0200 Subject: [PATCH 05/81] [REM] older searchview doc (deprecated/replaced) bzr revid: xmo@openerp.com-20120425122056-bdvsfjbtc7bmhsuw --- doc/search-view.rst | 236 +++++++++++++++++--------------------------- 1 file changed, 92 insertions(+), 144 deletions(-) diff --git a/doc/search-view.rst b/doc/search-view.rst index 4675649a805..9d5944d41d6 100644 --- a/doc/search-view.rst +++ b/doc/search-view.rst @@ -16,13 +16,12 @@ multiple fields). The goal for this change is twofold: The internal structure of the faceted search is inspired by `VisualSearch `_ [#]_. -As does VisualSearch, the new search view is based on `Backbone -`_ and makes significant -use of Backbone's models and collections (OpenERP Web's widgets make a -good replacement for Backbone's own views). As a result, understanding -the implementation details of the OpenERP Web 7 search view also -requires a basic understanding of Backbone's models, collections and -events. +As does VisualSearch, the new search view is based on `Backbone`_ and +makes significant use of Backbone's models and collections (OpenERP +Web's widgets make a good replacement for Backbone's own views). As a +result, understanding the implementation details of the OpenERP Web 7 +search view also requires a basic understanding of Backbone's models, +collections and events. .. note:: @@ -45,7 +44,7 @@ objects is stored in the ``openerp.web.search.fields`` :js:class:`~openerp.web.Registry` where new field types and widgets can be added. -Search view inputs have three main roles: +Search view inputs have four main roles: Loading defaults ++++++++++++++++ @@ -81,7 +80,9 @@ the user) and should fetch an ``Array`` of possible completions [#]_. A default implementation is provided which fetches nothing. -A completion item is an object literal with two keys: +A completion item is a javascript object with two keys (technically it +can have any number of keys, but only these two will be used by the +search view): ``label`` @@ -136,168 +137,105 @@ only once. dynamically collects, lays out and renders filters? => exercises drawer thingies -Interaction between the Search View and VisualSearch ----------------------------------------------------- +Programmatic interactions: internal model +----------------------------------------- -The core data abstraction in VisualSearch is -:js:class:`VS.model.SearchQuery`, a backbone Collection holding -instances of the :js:class:`VS.model.SearchFacet` backbone Model. +This new searchview is built around an instance of +:js:class:`~openerp.web.search.SearchQuery` available as +:js:attr:`openerp.web.SearchView.query`. -Backbone models can hold any number of informal properties interacted -with through the :js:func:`~Backbone.Model.get` and -:js:func:`~Backbone.Model.set` methods. VisualSearch reserves three -such properties for its behavior, these properties *must* be correctly -set on all search facets created programmatically: +The query is a `backbone collection`_ of +:js:class:`~openerp.web.search.Facet` objects, which can be interacted +with directly by external objects or search view controls +(e.g. widgets displayed in the drawer). -``app`` - a reference to the VisualSearch instance using this facet. In the - search view, this instance is available as the - :js:attr:`~openerp.web.SearchView.vs` attribute to the searchview - instance. +.. js:class:: openerp.web.search.SearchQuery -``category`` - the *name* of the facet, displayed in the first section of a facet - view. + The current search query of the search view, provides convenience + behaviors for manipulating :js:class:`~openerp.web.search.Facet` + on top of the usual `backbone collection`_ methods. -``value`` - the *displayed value* of the facet, it is directly printed to the - right of the category. + The query ensures all of its facets contain at least one + :js:class:`~openerp.web.search.FacetValue` instance. Otherwise, + the facet is automatically removed from the query. -The search view uses additional keys to store state and data it needs -to associate with facet objects: + .. js:function:: openerp.web.search.SearchQuery.add(values, options) -``field`` - the search field instance which created the facet, used when the - search view needs to serialize the facets. + Overridden from the base ``add`` method so that adding a facet + which is *already* in the collection will merge the value of + the new facet into the old one rather than add a second facet + with different values. -``json`` - the "logical" value of the facet, can be absent if the logical and - "printable" values of the facet are the same (e.g. for a basic text - field). + :param values: facet, facet attributes or array thereof + :returns: the collection itself - This value may be a complex javascript object such as an array (the - name stands for json-compatible value, it is not a JSON-encoded - string). + .. js:function:: openerp.web.search.SearchQuery.toggle(value, options) -.. note:: + Convenience method for toggling facet values in a query: + removes the values (through the facet itself) if they are + present, adds them if they are not. If the facet itself is not + in the collection, adds it automatically. - in order to simplify getting the logical value of a search facet - model, :js:class:`VS.model.SearchFacet` has been extended with a - :js:func:`~VS.model.SearchFacet.value` method + A toggling is atomic: only one change event will be triggered + on the facet regardless of the number of values added to or + removed from the facet (if the facet already exists), and the + facet is only removed from the query if it has no value *at + the end* of the toggling. -Extensions and patches to VisualSearch -++++++++++++++++++++++++++++++++++++++ + :param value: facet or facet attributes + :returns: the collection -.. js:function:: VS.model.SearchFacet.value() +.. js:class:: openerp.web.search.Facet - Bundles the logic of selecting between ``json`` and ``value`` in - order to get the logical value of a facet. + A `backbone model`_ representing a single facet of the current + research. May map to a search field, or to a more complex or + fuzzier input (e.g. a custom filter or an advanced search). -.. js:attribute:: VS.options.callbacks.make_facet + .. js:attribute:: category - Called by :js:class:`VS.ui.SearchBox` when it needs to create a - new search facet *view*. By default this is not supported by - VisualSearch, and requires monkey-patching - :js:func:`VS.ui.SearchBox.renderFacet`. + The displayed name of the facet, as a ``String``. This is a + backbone model attribute. - This patch should not alter any behavior if - :js:attr:`~VS.options.callbacks.make_facet` is not used. + .. js:attribute:: field -.. js:attribute:: VS.options.callbacks.make_input + The :js:class:`~openerp.web.search.Input` instance which + originally created the facet, used to delegate some operations + (such as serializing the facet's values to domains and + contexts). This is a backbone model attribute. - Similar to :js:attr:`~VS.options.callbacks.make_facet`, but called - when the :js:class:`~VS.ui.SearchBox` needs to create a search - input view. It requires monkey-patching - :js:func:`VS.ui.SearchBox.renderSearchInput`. + .. js:attribute:: values -Finally, :js:func:`VS.ui.SearchBox.searchEvent` is monkey-patched to -get rid of its serialize/load round-tripping of facet data: the -additional attributes needed by the search view don't round-trip (at -all) so VisualSearch must not load any data from its (fairly -simplistic) text-serialization format. + :js:class:`~openerp.web.search.FacetValues` as a javascript + attribute, stores all the values for the facet and helps + propagate their events to the facet. Is also available as a + backbone attribute (via ``#get`` and ``#set``) in which cases + it serializes to and deserializes from javascript arrays (via + ``Collection#toJSON`` and ``Collection#reset``). -.. note:: +.. js:class:: openerp.web.search.FacetValues - a second issue is that — as of `commit 3fca87101d`_ — VisualSearch - correctly serializes facet categories containing spaces but is - unable to load them back in. It also does not handle facets with - *empty* categories correctly. + `Backbone collection`_ of + :js:class:`~openerp.web.search.FacetValue` instances. -Loading Defaults ----------------- +.. js:class:: openerp.web.search.FacetValue -After loading the view data, the SearchView will call -:js:func:`openerp.web.search.Input.facet_for_defaults` on each of its -inputs with the ``defaults`` mapping of key:values (where each key -corresponds to an input). This method should look into the -``defaults`` mapping and fetch the field's default value as a -:js:class:`~VS.models.SearchFacet` if applicable. + `Backbone model`_ representing a single value within a facet, + represents a pair of (displayed name, logical value). -The default implementation is to check if there is a default value for -the current input's name (via -:js:attr:`openerp.web.search.Input.attrs.name`) and if there is to -convert this value to a :js:class:`~VS.models.SearchFacet` by calling -:js:func:`openerp.web.search.Input.facet_for`. + .. js:attribute:: label -There is no built-in (default) implementation of -:js:func:`openerp.web.search.Input.facet_for`. This method should -fetch the :js:class:`~VS.models.SearchFacet` corresponding to the -"raw" value passed as argument. + Backbone model attribute storing the "displayable" + representation of the value, visually output to the + user. Must be a string. -Providing auto-completion -------------------------- + .. js:attribute:: value -An important component of the unified search view is the faceted -autocompletion pane. In order to provide good user and developer -experiences, this pane is pluggable (value-wise): each and every -control of the search view can check for (and provide) categorized -auto-completions for a given value being typed by the user. + Backbone model attribute storing the logical/internal value + (of itself), will be used by + :js:class:`~openerp.web.search.Input` to serialize to domains + and contexts. -This is done by implementing -:js:func:`openerp.web.search.Input.complete`: the method is provided -with a value to complete, and should fetch an ``Array`` of completion -values. These completion values will then be provided to the global -autocompletion list, implemented via `jquery-ui autocomplete -`_. - -Because the search view uses a custom renderer for its completion, it -was possible to fix some incompatibilities between the attributes of -completion items and VisualSearch's facet model: - -Actual completion items -+++++++++++++++++++++++ - -These are selectable items, and upon selection are turned into actual -search facet objects. They should have all the properties of a search -facet (as described above) and can have one more optional property: -``label``. - -When rendering an item in the list, the renderer will first try to use -the ``label`` property if it exists (``label`` can contain HTML and -will be inserted as-is, so it can bold or emphasize some of its -elements), if it does not the ``value`` property will be used. - -.. note:: the ``app`` key should not be specified on completion item, - it will be set automatically when the search view creates - the facet from the item. - -Section titles -++++++++++++++ - -A second kind of completion values is the section titles. Section -titles are similar to completion items but only have a ``category`` -property. They will be rendered in a different style and can not be -selected in the auto-completion (they will be skipped). - -.. note:: - - Technically, section title items can have any property they want - *as long as they do not have a value property*. A ``value`` - property set to ``false``, ``null`` or ``undefined`` is **not** - equivalent to not having a ``value`` property. - -If an input *may* fetch more than one completion item, it *should* -prepend a section title (using its own name) to the completion items. + Can be of any type. Converting from facet objects ----------------------------- @@ -327,7 +265,7 @@ Converting to facet objects Changes ------- -.. todo:: merge in changelog instead +.. todo:: merge in changelog instead? The displaying of the search view was significantly altered from OpenERP Web 6.1 to OpenERP Web 7. @@ -422,5 +360,15 @@ Many To One .. [#] search view fields may also bundle context data to add to the search context +.. _Backbone: + http://documentcloud.github.com/backbone/ + +.. _Backbone.Collection: +.. _Backbone collection: + http://documentcloud.github.com/backbone/#Collection + +.. _Backbone model: + http://documentcloud.github.com/backbone/#Model + .. _commit 3fca87101d: - https://github.com/documentcloud/visualsearch/commit/3fca87101d + https://github.com/documentcloud/visualsearch/commit/3fca87101d From 2591fa5e1e03e1d3ec32f27b23abf22567e269a5 Mon Sep 17 00:00:00 2001 From: Xavier Morel Date: Thu, 26 Apr 2012 12:29:49 +0200 Subject: [PATCH 06/81] [FIX] missing state propagation in searchview initialization, test defaults calling on fields bzr revid: xmo@openerp.com-20120426102949-xtv3inug3sue0h6a --- addons/web/static/src/js/search.js | 17 +++++- addons/web/static/test/search.js | 89 ++++++++++++++++++++++++++++++ addons/web/static/test/test.html | 2 +- 3 files changed, 106 insertions(+), 2 deletions(-) diff --git a/addons/web/static/src/js/search.js b/addons/web/static/src/js/search.js index 4c1862365ca..6f02a8d9934 100644 --- a/addons/web/static/src/js/search.js +++ b/addons/web/static/src/js/search.js @@ -38,6 +38,18 @@ my.Facet = Backbone.Model.extend({ return Backbone.Model.prototype.set.call(this, key, value); } this.values.reset(value); + }, + toJSON: function () { + var out = {}; + var attrs = this.attributes; + for(var att in attrs) { + if (!attrs.hasOwnProperty(att) || att === 'field') { + continue; + } + out[att] = attrs[att]; + } + out.values = this.values.toJSON(); + return out; } }); my.SearchQuery = Backbone.Collection.extend({ @@ -215,7 +227,10 @@ instance.web.SearchView = instance.web.Widget.extend(/** @lends instance.web.Sea $.when(load_view, filters) .pipe(function (load) { return load[0]; }) - .then(this.on_loaded); + .pipe(this.on_loaded) + .fail(function () { + self.ready.reject.apply(null, arguments); + }); } this.$element.on('click', '.oe_searchview_unfold_drawer', function () { diff --git a/addons/web/static/test/search.js b/addons/web/static/test/search.js index 7403afb5d0d..f53e4cd294a 100644 --- a/addons/web/static/test/search.js +++ b/addons/web/static/test/search.js @@ -1,4 +1,9 @@ $(document).ready(function () { + var xhr = QWeb2.Engine.prototype.get_xhr(); + xhr.open('GET', '/web/static/src/xml/base.xml', false); + xhr.send(null); + var doc = xhr.responseXML; + var instance; module('query', { setup: function () { @@ -140,4 +145,88 @@ $(document).ready(function () { {label: 'V2', value: 1} ]) }); + + module('defaults', { + setup: function () { + instance = window.openerp.init([]); + window.openerp.web.corelib(instance); + window.openerp.web.coresetup(instance); + window.openerp.web.chrome(instance); + window.openerp.web.data(instance); + window.openerp.web.search(instance); + + instance.web.qweb.add_template(doc); + + instance.connection.responses = {}; + instance.connection.rpc_function = function (url, payload) { + if (!(url.url in this.responses)) { + return $.Deferred().reject( + {}, 'failed', + _.str.sprintf("Url %s not found in mock responses", + url.url)).promise(); + } + return $.when(this.responses[url.url](payload)); + }; + } + }); + asyncTest('defaults calling', 2, function () { + var defaults_called = false; + + instance.web.search.fields.add( + 'dummy', 'instance.dummy.DummyWidget'); + instance.dummy = {}; + instance.dummy.DummyWidget = instance.web.search.Field.extend({ + facet_for_defaults: function (defaults) { + defaults_called = true; + return $.when({ + field: this, + category: 'Dummy', + values: [{label: 'dummy', value: defaults.dummy}] + }); + } + }); + instance.connection.responses['/web/searchview/load'] = function () { + return {result: {fields_view: { + type: 'search', + fields: { + dummy: {type: 'char'} + }, + arch: { + tag: 'search', + attrs: {}, + children: [{ + tag: 'field', + attrs: { + name: 'dummy', + widget: 'dummy' + }, + children: [] + }] + } + }}}; + }; + instance.connection.responses['/web/searchview/get_filters'] = function () { + return []; + }; + instance.connection.responses['/web/searchview/fields_get'] = function () { + return {result: {fields: { + dummy: {type: 'char'} + }}}; + }; + + var dataset = {model: 'dummy.model', get_context: function () { return {}; }}; + var view = new instance.web.SearchView(null, dataset, false, {dummy: 42}); + view.appendTo($('#qunit-fixture')) + .always(start) + .then(function () { + ok(defaults_called, "should have called defaults"); + deepEqual( + view.query.toJSON(), + [{category: 'Dummy', values: [{label: 'dummy', value: 42}]}], + "should have generated a facet with the default value"); + }, function (error) { + ok(false, error.message); + }); + }); + // TODO: test defaults for various built-in widgets? }); diff --git a/addons/web/static/test/test.html b/addons/web/static/test/test.html index cc1916399f3..e352f63c17c 100644 --- a/addons/web/static/test/test.html +++ b/addons/web/static/test/test.html @@ -13,7 +13,7 @@ - + From 4694dcf00de6e0f7203a9b9eda8bf1c2ef10a491 Mon Sep 17 00:00:00 2001 From: Xavier Morel Date: Thu, 26 Apr 2012 13:04:34 +0200 Subject: [PATCH 07/81] [TEST] search view asking inputs for completion bzr revid: xmo@openerp.com-20120426110434-pobw0xp1f5szvdcx --- addons/web/static/test/search.js | 68 ++++++++++++++++++++++++-------- 1 file changed, 52 insertions(+), 16 deletions(-) diff --git a/addons/web/static/test/search.js b/addons/web/static/test/search.js index f53e4cd294a..57ec2bd51f1 100644 --- a/addons/web/static/test/search.js +++ b/addons/web/static/test/search.js @@ -169,22 +169,13 @@ $(document).ready(function () { }; } }); - asyncTest('defaults calling', 2, function () { - var defaults_called = false; + function makeSearchView(dummy_widget_attributes) { instance.web.search.fields.add( 'dummy', 'instance.dummy.DummyWidget'); instance.dummy = {}; - instance.dummy.DummyWidget = instance.web.search.Field.extend({ - facet_for_defaults: function (defaults) { - defaults_called = true; - return $.when({ - field: this, - category: 'Dummy', - values: [{label: 'dummy', value: defaults.dummy}] - }); - } - }); + instance.dummy.DummyWidget = instance.web.search.Field.extend( + dummy_widget_attributes); instance.connection.responses['/web/searchview/load'] = function () { return {result: {fields_view: { type: 'search', @@ -215,18 +206,63 @@ $(document).ready(function () { }; var dataset = {model: 'dummy.model', get_context: function () { return {}; }}; - var view = new instance.web.SearchView(null, dataset, false, {dummy: 42}); + return new instance.web.SearchView(null, dataset, false, {dummy: 42}); + } + asyncTest('defaults calling', 2, function () { + var defaults_called = false; + + var view = makeSearchView({ + facet_for_defaults: function (defaults) { + defaults_called = true; + return $.when({ + field: this, + category: 'Dummy', + values: [{label: 'dummy', value: defaults.dummy}] + }); + } + }); view.appendTo($('#qunit-fixture')) .always(start) - .then(function () { + .fail(function (error) { ok(false, error.message); }) + .done(function () { ok(defaults_called, "should have called defaults"); deepEqual( view.query.toJSON(), [{category: 'Dummy', values: [{label: 'dummy', value: 42}]}], "should have generated a facet with the default value"); - }, function (error) { - ok(false, error.message); }); }); // TODO: test defaults for various built-in widgets? + asyncTest('completion calling', 4, function () { + var view = makeSearchView({ + complete: function () { + return $.when({ + label: "Dummy", + facet: { + field: this, + category: 'Dummy', + values: [{label: 'dummy', value: 42}] + } + }); + } + }); + view.appendTo($('#qunit-fixture')) + .always(start) + .fail(function (error) { ok(false, error.message); }) + .done(function () { + stop(); + view.complete_global_search({term: "dum"}, function (completions) { + start(); + equal(completions.length, 1, "should have a single completion"); + var completion = completions[0]; + equal(completion.label, "Dummy", + "should have provided label"); + equal(completion.facet.category, "Dummy", + "should have provided category"); + deepEqual(completion.facet.values, + [{label: 'dummy', value: 42}], + "should have provided values"); + }); + }); + }); }); From eb989f68a80640bef55a74bee9e64f3bf013d0ea Mon Sep 17 00:00:00 2001 From: Xavier Morel Date: Thu, 26 Apr 2012 14:12:10 +0200 Subject: [PATCH 08/81] [TEST] behavior when selecting a given completion, fix handler bzr revid: xmo@openerp.com-20120426121210-012l0doboktnic8s --- addons/web/static/src/js/search.js | 3 +- addons/web/static/test/search.js | 67 ++++++++++++++++++++++++++++-- 2 files changed, 64 insertions(+), 6 deletions(-) diff --git a/addons/web/static/src/js/search.js b/addons/web/static/src/js/search.js index 6f02a8d9934..f94cad0dc10 100644 --- a/addons/web/static/src/js/search.js +++ b/addons/web/static/src/js/search.js @@ -381,8 +381,7 @@ instance.web.SearchView = instance.web.Widget.extend(/** @lends instance.web.Sea select_completion: function (e, ui) { e.preventDefault(); - // FIXME: could have multiple values, shitty API - this.query.add_value(ui.item.category, ui.item.values[0]); + this.query.add(ui.item.facet); }, renderFacets: function () { var self = this; diff --git a/addons/web/static/test/search.js b/addons/web/static/test/search.js index 57ec2bd51f1..40496c7d7eb 100644 --- a/addons/web/static/test/search.js +++ b/addons/web/static/test/search.js @@ -146,7 +146,7 @@ $(document).ready(function () { ]) }); - module('defaults', { + module('inputs', { setup: function () { instance = window.openerp.init([]); window.openerp.web.corelib(instance); @@ -170,7 +170,7 @@ $(document).ready(function () { } }); - function makeSearchView(dummy_widget_attributes) { + function makeSearchView(dummy_widget_attributes, defaults) { instance.web.search.fields.add( 'dummy', 'instance.dummy.DummyWidget'); instance.dummy = {}; @@ -206,7 +206,7 @@ $(document).ready(function () { }; var dataset = {model: 'dummy.model', get_context: function () { return {}; }}; - return new instance.web.SearchView(null, dataset, false, {dummy: 42}); + return new instance.web.SearchView(null, dataset, false, defaults); } asyncTest('defaults calling', 2, function () { var defaults_called = false; @@ -220,7 +220,7 @@ $(document).ready(function () { values: [{label: 'dummy', value: defaults.dummy}] }); } - }); + }, {dummy: 42}); view.appendTo($('#qunit-fixture')) .always(start) .fail(function (error) { ok(false, error.message); }) @@ -265,4 +265,63 @@ $(document).ready(function () { }); }); }); + // TODO: test completions for various built-in widgets? + asyncTest('completion facet selection', 2, function () { + var completion = { + label: "Dummy", + facet: { + field: {}, + category: 'Dummy', + values: [{label: 'dummy', value: 42}] + } + }; + + var view = makeSearchView({}); + view.appendTo($('#qunit-fixture')) + .always(start) + .fail(function (error) { ok(false, error.message); }) + .done(function () { + view.select_completion( + {preventDefault: function () {}}, + {item: completion}); + equal(view.query.length, 1, "should have one facet in the query"); + deepEqual( + view.query.at(0).toJSON(), + {category: 'Dummy', values: [{label: 'dummy', value: 42}]}, + "should have the right facet in the query"); + }); + }); + asyncTest('completion facet selection: new value existing facet', 3, function () { + var field = {}; + var completion = { + label: "Dummy", + facet: { + field: field, + category: 'Dummy', + values: [{label: 'dummy', value: 42}] + } + }; + + var view = makeSearchView({}); + view.appendTo($('#qunit-fixture')) + .always(start) + .fail(function (error) { ok(false, error.message); }) + .done(function () { + view.query.add({field: field, category: 'Dummy', + values: [{label: 'previous', value: 41}]}); + equal(view.query.length, 1, 'should have newly added facet'); + view.select_completion( + {preventDefault: function () {}}, + {item: completion}); + equal(view.query.length, 1, "should still have only one facet"); + var facet = view.query.at(0); + deepEqual( + facet.get('values'), + [{label: 'previous', value: 41}, {label: 'dummy', value: 42}], + "should have added selected value to old one"); + }); + }); + + // TODO: test drawer rendering + // TODO: UI tests? }); From 6d02c640bfc52c1543187c27287b6840af179309 Mon Sep 17 00:00:00 2001 From: Xavier Morel Date: Thu, 26 Apr 2012 15:58:17 +0200 Subject: [PATCH 09/81] [TEST] defaults handling for selection & m2o fields, fix bugs in them bzr revid: xmo@openerp.com-20120426135817-wesh3nkytuieilky --- addons/web/static/src/js/search.js | 16 +++- addons/web/static/test/search.js | 141 +++++++++++++++++++++++++++++ 2 files changed, 152 insertions(+), 5 deletions(-) diff --git a/addons/web/static/src/js/search.js b/addons/web/static/src/js/search.js index f94cad0dc10..a75dd6f584d 100644 --- a/addons/web/static/src/js/search.js +++ b/addons/web/static/src/js/search.js @@ -864,9 +864,13 @@ instance.web.search.FilterGroup = instance.web.search.Input.extend(/** @lends in return $.when(null); }, facet_for_defaults: function (defaults) { - var fs = _(this.filters).filter(function (f) { - return f.attrs && f.attrs.name && !!defaults[f.attrs.name]; - }); + var fs = _(this.filters).chain() + .filter(function (f) { + return f.attrs && f.attrs.name && !!defaults[f.attrs.name]; + }).map(function (f) { + return {label: f.attrs.string || f.attrs.name, + value: f}; + }).value(); if (_.isEmpty(fs)) { return $.when(null); } return $.when({ category: _t("Filter"), @@ -1001,6 +1005,7 @@ instance.web.search.Field = instance.web.search.Input.extend( /** @lends instanc }, facet_for: function (value) { return $.when({ + field: this, category: this.attrs.string || this.attrs.name, values: [{label: String(value), value: value}] }); @@ -1172,7 +1177,7 @@ instance.web.search.SelectionField = instance.web.search.Field.extend(/** @lends if (!match) { return $.when(null); } return $.when({ category: this.attrs.string, - value: match[1], + field: this, values: [{label: match[1], value: match[0]}] }); }, @@ -1275,9 +1280,10 @@ instance.web.search.ManyToOneField = instance.web.search.CharField.extend({ }); } return this.model.call('name_get', [value], {}).pipe(function (names) { + if (_(names).isEmpty()) { return null; } return { category: self.attrs.string, - value: names[0][1], + field: self, values: [{label: names[0][1], value: names[0][0]}] }; }) diff --git a/addons/web/static/test/search.js b/addons/web/static/test/search.js index 40496c7d7eb..8f15b86b2e7 100644 --- a/addons/web/static/test/search.js +++ b/addons/web/static/test/search.js @@ -232,6 +232,147 @@ $(document).ready(function () { "should have generated a facet with the default value"); }); }); + asyncTest('FilterGroup defaults', 3, function () { + var view = {inputs: []}; + var filter_a = new instance.web.search.Filter( + {attrs: {name: 'a'}}, view); + var filter_b = new instance.web.search.Filter( + {attrs: {name: 'b'}}, view); + var group = new instance.web.search.FilterGroup( + [filter_a, filter_b], view); + group.facet_for_defaults({a: true, b: true}) + .always(start) + .fail(function (error) { ok(false, error && error.message); }) + .done(function (facet) { + var model = facet; + if (!(model instanceof instance.web.search.Facet)) { + model = new instance.web.search.Facet(facet); + } + var values = model.values; + equal(values.length, 2, 'facet should have two values'); + strictEqual(values.at(0).get('value'), filter_a); + strictEqual(values.at(1).get('value'), filter_b); + }); + }); + asyncTest('Field default', 4, function () { + var view = {inputs: []}; + var f = new instance.web.search.Field( + {attrs: {string: 'Dummy', name: 'dummy'}}, {}, view); + f.facet_for_defaults({dummy: 42}) + .always(start) + .fail(function (error) { ok(false, error && error.message); }) + .done(function (facet) { + var model = facet; + if (!(model instanceof instance.web.search.Facet)) { + model = new instance.web.search.Facet(facet); + } + strictEqual( + model.get('category'), + f.attrs.string, + "facet category should be field label"); + strictEqual( + model.get('field'), f, + "facet field should be field which created default"); + equal(model.values.length, 1, "facet should have a single value"); + deepEqual( + model.values.toJSON(), + [{label: '42', value: 42}], + "facet value should match provided default"); + }); + }); + asyncTest('Selection default: valid value', 4, function () { + var view = {inputs: []}; + var f = new instance.web.search.SelectionField( + {attrs: {name: 'dummy', string: 'Dummy'}}, + {selection: [[1, "Foo"], [2, "Bar"], [3, "Baz"], [4, "Qux"]]}, + view); + f.facet_for_defaults({dummy: 3}) + .always(start) + .fail(function (error) { ok(false, error && error.message); }) + .done(function (facet) { + var model = facet; + if (!(model instanceof instance.web.search.Facet)) { + model = new instance.web.search.Facet(facet); + } + strictEqual( + model.get('category'), + f.attrs.string, + "facet category should be field label"); + strictEqual( + model.get('field'), f, + "facet field should be field which created default"); + equal(model.values.length, 1, "facet should have a single value"); + deepEqual( + model.values.toJSON(), + [{label: 'Baz', value: 3}], + "facet value should match provided default's selection"); + }); + }); + asyncTest('Selection default: invalid value', 1, function () { + var view = {inputs: []}; + var f = new instance.web.search.SelectionField( + {attrs: {name: 'dummy', string: 'Dummy'}}, + {selection: [[1, "Foo"], [2, "Bar"], [3, "Baz"], [4, "Qux"]]}, + view); + f.facet_for_defaults({dummy: 42}) + .always(start) + .fail(function (error) { ok(false, error && error.message); }) + .done(function (facet) { + ok(!facet, "an invalid value should result in a not-facet"); + }); + }); + asyncTest("M2O default: valid value", 7, function () { + var view = {inputs: []}, id = 4; + var f = new instance.web.search.ManyToOneField( + {attrs: {name: 'dummy', string: 'Dummy'}}, + {relation: 'dummy.model.name'}, + view); + instance.connection.responses['/web/dataset/call_kw'] = function (req) { + equal(req.params.method, 'name_get', + "m2o should resolve default id"); + equal(req.params.model, f.attrs.relation, + "query model should match m2o relation"); + equal(req.params.args[0], id); + return {result: [[id, "DumDumDum"]]}; + }; + f.facet_for_defaults({dummy: id}) + .always(start) + .fail(function (error) { ok(false, error && error.message); }) + .done(function (facet) { + var model = facet; + if (!(model instanceof instance.web.search.Facet)) { + model = new instance.web.search.Facet(facet); + } + strictEqual( + model.get('category'), + f.attrs.string, + "facet category should be field label"); + strictEqual( + model.get('field'), f, + "facet field should be field which created default"); + equal(model.values.length, 1, "facet should have a single value"); + deepEqual( + model.values.toJSON(), + [{label: 'DumDumDum', value: id}], + "facet value should match provided default's selection"); + }); + }); + asyncTest("M2O default: invalid value", 1, function () { + var view = {inputs: []}, id = 4; + var f = new instance.web.search.ManyToOneField( + {attrs: {name: 'dummy', string: 'Dummy'}}, + {relation: 'dummy.model.name'}, + view); + instance.connection.responses['/web/dataset/call_kw'] = function (req) { + return {result: []}; + }; + f.facet_for_defaults({dummy: id}) + .always(start) + .fail(function (error) { ok(false, error && error.message); }) + .done(function (facet) { + ok(!facet, "an invalid m2o default should yield a non-facet"); + }); + }); // TODO: test defaults for various built-in widgets? asyncTest('completion calling', 4, function () { var view = makeSearchView({ From 19e771dd9f43f9ff1b5c50e1181a8ef9244f4afc Mon Sep 17 00:00:00 2001 From: Xavier Morel Date: Thu, 26 Apr 2012 16:10:33 +0200 Subject: [PATCH 10/81] [IMP] remove redundancy in creating a facet from a default value in m2o fields bzr revid: xmo@openerp.com-20120426141033-5blb5ifdfnzeea03 --- addons/web/static/src/js/search.js | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/addons/web/static/src/js/search.js b/addons/web/static/src/js/search.js index a75dd6f584d..5ef6db42f2b 100644 --- a/addons/web/static/src/js/search.js +++ b/addons/web/static/src/js/search.js @@ -1271,21 +1271,17 @@ instance.web.search.ManyToOneField = instance.web.search.CharField.extend({ }); }, facet_for: function (value) { - var self = this; + var self = this, fromPair = function (a) { return { + category: self.attrs.string, + field: self, + values: [{label: a[1], value: a[0]}] + } }; if (value instanceof Array) { - return $.when({ - category: this.attrs.string, - value: value[1], - values: [{label: value[1], value: value[0]}] - }); + return $.when(fromPair(value)); } return this.model.call('name_get', [value], {}).pipe(function (names) { if (_(names).isEmpty()) { return null; } - return { - category: self.attrs.string, - field: self, - values: [{label: names[0][1], value: names[0][0]}] - }; + return fromPair(names[0]); }) }, make_domain: function (name, operator, facet) { From 8f5a591ab08ee430fbdfd53c56eddcaee31cba16 Mon Sep 17 00:00:00 2001 From: Xavier Morel Date: Fri, 27 Apr 2012 10:06:07 +0200 Subject: [PATCH 11/81] [TESTS] completion call on various widgets, fixed corresponding implementations bzr revid: xmo@openerp.com-20120427080607-1bw1jpmu7h6zxdin --- addons/web/static/src/js/search.js | 44 +++++---- addons/web/static/test/search.js | 142 ++++++++++++++++++++++++++++- 2 files changed, 167 insertions(+), 19 deletions(-) diff --git a/addons/web/static/src/js/search.js b/addons/web/static/src/js/search.js index 5ef6db42f2b..8780e1cbd81 100644 --- a/addons/web/static/src/js/search.js +++ b/addons/web/static/src/js/search.js @@ -1076,9 +1076,12 @@ instance.web.search.CharField = instance.web.search.Field.extend( /** @lends ins field: '' + this.attrs.string + '', value: '' + _.str.escapeHTML(value) + ''}); return $.when([{ - category: this.attrs.string, label: label, - value: [{label: label, value: value}] + facet: { + category: this.attrs.string, + field: this, + values: [{label: value, value: value}] + } }]); } }); @@ -1158,16 +1161,18 @@ instance.web.search.SelectionField = instance.web.search.Field.extend(/** @lends return label.toLowerCase().indexOf(needle.toLowerCase()) !== -1; }) .map(function (sel) { - // FIXME fucking repetition man, find something better return { - category: self.attrs.string, - value: sel[1], - values: [{value: sel[0], label: sel[1]}] + label: sel[1], + facet: { + category: self.attrs.string, + field: self, + values: [{value: sel[0], label: sel[1]}] + } }; }).value(); if (_.isEmpty(results)) { return $.when(null); } - return $.when.apply(null, [{ - category: this.attrs.string + return $.when.call(null, [{ + label: this.attrs.string }].concat(results)); }, facet_for: function (value) { @@ -1216,16 +1221,18 @@ instance.web.search.DateField = instance.web.search.Field.extend(/** @lends inst complete: function (needle) { var d = Date.parse(needle); if (!d) { return $.when(null); } - var value = instance.web.format_value(d, this.attrs); + var date_string = instance.web.format_value(d, this.attrs); var label = _.str.sprintf(_.str.escapeHTML( _t("Search %(field)s at: %(value)s")), { field: '' + this.attrs.string + '', - value: '' + value + ''}); + value: '' + date_string + ''}); return $.when([{ - category: this.attrs.string, label: label, - // FIXME: brain broken - values: [{label: value, value: d}] + facet: { + category: this.attrs.string, + field: this, + values: [{label: date_string, value: d}] + } }]); } }); @@ -1260,12 +1267,15 @@ instance.web.search.ManyToOneField = instance.web.search.CharField.extend({ context: {} }).pipe(function (results) { if (_.isEmpty(results)) { return null; } - return [{category: self.attrs.string}].concat( + return [{label: self.attrs.string}].concat( _(results).map(function (result) { return { - category: self.attrs.string, - value: result[1], - values: [{label: result[1], value: result[0]}] + label: result[1], + facet: { + category: self.attrs.string, + field: self, + values: [{label: result[1], value: result[0]}] + } }; })); }); diff --git a/addons/web/static/test/search.js b/addons/web/static/test/search.js index 8f15b86b2e7..53f32e875d2 100644 --- a/addons/web/static/test/search.js +++ b/addons/web/static/test/search.js @@ -153,6 +153,8 @@ $(document).ready(function () { window.openerp.web.coresetup(instance); window.openerp.web.chrome(instance); window.openerp.web.data(instance); + // date complete + window.openerp.web.formats(instance); window.openerp.web.search(instance); instance.web.qweb.add_template(doc); @@ -373,7 +375,6 @@ $(document).ready(function () { ok(!facet, "an invalid m2o default should yield a non-facet"); }); }); - // TODO: test defaults for various built-in widgets? asyncTest('completion calling', 4, function () { var view = makeSearchView({ complete: function () { @@ -406,7 +407,7 @@ $(document).ready(function () { }); }); }); - // TODO: test completions for various built-in widgets? + asyncTest('completion facet selection', 2, function () { var completion = { label: "Dummy", @@ -462,6 +463,143 @@ $(document).ready(function () { "should have added selected value to old one"); }); }); + asyncTest('Field completion', 1, function () { + var view = {inputs: []}; + var f = new instance.web.search.Field({attrs: {}}, {}, view); + f.complete('foo') + .always(start) + .fail(function (error) { ok(false, error.message); }) + .done(function (completions) { + ok(_(completions).isEmpty(), "field should not provide any completion"); + }); + }); + asyncTest('CharField completion', 6, function () { + var view = {inputs: []}; + var f = new instance.web.search.CharField( + {attrs: {string: "Dummy"}}, {}, view); + f.complete('foo<') + .always(start) + .fail(function (error) { ok(false, error.message); }) + .done(function (completions) { + equal(completions.length, 1, "should provide a single completion"); + var c = completions[0]; + equal(c.label, "Search Dummy for: foo<", + "should propose a fuzzy matching/searching, with the" + + " value escaped"); + ok(c.facet, "completion should contain a facet proposition"); + var facet = new instance.web.search.Facet(c.facet); + equal(facet.get('category'), f.attrs.string, + "completion facet should bear the field's name"); + strictEqual(facet.get('field'), f, + "completion facet should yield the field"); + deepEqual(facet.values.toJSON(), [{label: 'foo<', value: 'foo<'}], + "facet should have single value using completion item"); + }); + }); + asyncTest('Selection completion: match found', 14, function () { + var view = {inputs: []}; + var f = new instance.web.search.SelectionField( + {attrs: {string: "Dummy"}}, + {selection: [[1, "Foo"], [2, "Bar"], [3, "Baz"], [4, "Bazador"]]}, + view); + f.complete("ba") + .always(start) + .fail(function (error) { ok(false, error.message); }) + .done(function (completions) { + equal(completions.length, 4, + "should provide two completions and a section title"); + deepEqual(completions[0], {label: "Dummy"}); + + var c1 = completions[1]; + equal(c1.label, "Bar"); + equal(c1.facet.category, f.attrs.string); + strictEqual(c1.facet.field, f); + deepEqual(c1.facet.values, [{label: "Bar", value: 2}]); + + var c2 = completions[2]; + equal(c2.label, "Baz"); + equal(c2.facet.category, f.attrs.string); + strictEqual(c2.facet.field, f); + deepEqual(c2.facet.values, [{label: "Baz", value: 3}]); + + var c3 = completions[3]; + equal(c3.label, "Bazador"); + equal(c3.facet.category, f.attrs.string); + strictEqual(c3.facet.field, f); + deepEqual(c3.facet.values, [{label: "Bazador", value: 4}]); + }); + }); + asyncTest('Selection completion: no match', 1, function () { + var view = {inputs: []}; + var f = new instance.web.search.SelectionField( + {attrs: {string: "Dummy"}}, + {selection: [[1, "Foo"], [2, "Bar"], [3, "Baz"], [4, "Bazador"]]}, + view); + f.complete("qux") + .always(start) + .fail(function (error) { ok(false, error.message); }) + .done(function (completions) { + ok(!completions, "if no value matches the needle, no completion shall be provided"); + }); + }); + asyncTest('Date completion', 6, function () { + instance.web._t.database.parameters = { + date_format: '%Y-%m-%d', + time_format: '%H:%M:%S' + }; + var view = {inputs: []}; + var f = new instance.web.search.DateField( + {attrs: {string: "Dummy"}}, {type: 'datetime'}, view); + f.complete('2012-05-21T21:21:21') + .always(start) + .fail(function (error) { ok(false, error.message); }) + .done(function (completions) { + equal(completions.length, 1, "should provide a single completion"); + var c = completions[0]; + equal(c.label, "Search Dummy at: 2012-05-21 21:21:21"); + var facet = new instance.web.search.Facet(c.facet); + equal(facet.get('category'), f.attrs.string); + equal(facet.get('field'), f); + var value = facet.values.at(0); + equal(value.get('label'), "2012-05-21 21:21:21"); + equal(value.get('value').getTime(), + new Date(2012, 4, 21, 21, 21, 21).getTime()); + }); + }); + asyncTest("M2O completion", 15, function () { + instance.connection.responses['/web/dataset/call_kw'] = function (req) { + equal(req.params.method, "name_search"); + equal(req.params.model, "dummy.model"); + deepEqual(req.params.args, []); + deepEqual(req.params.kwargs.name, 'bob'); + return {result: [[42, "choice 1"], [43, "choice @"]]} + }; + + var view = {inputs: []}; + var f = new instance.web.search.ManyToOneField( + {attrs: {string: 'Dummy'}}, {relation: 'dummy.model'}, view); + f.complete("bob") + .always(start) + .fail(function (error) { ok(false, error.message); }) + .done(function (c) { + equal(c.length, 3, "should return results + title"); + var title = c[0]; + equal(title.label, f.attrs.string, "title should match field name"); + ok(!title.facet, "title should not have a facet"); + + var f1 = new instance.web.search.Facet(c[1].facet); + equal(c[1].label, "choice 1"); + equal(f1.get('category'), f.attrs.string); + equal(f1.get('field'), f); + deepEqual(f1.values.toJSON(), [{label: 'choice 1', value: 42}]); + + var f2 = new instance.web.search.Facet(c[2].facet); + equal(c[2].label, "choice @"); + equal(f2.get('category'), f.attrs.string); + equal(f2.get('field'), f); + deepEqual(f2.values.toJSON(), [{label: 'choice @', value: 43}]); + }); + }); // TODO: test drawer rendering // TODO: UI tests? From ad21cdbffc101fb194790bbb994244a771b7cd75 Mon Sep 17 00:00:00 2001 From: Xavier Morel Date: Fri, 27 Apr 2012 10:09:11 +0200 Subject: [PATCH 12/81] [IMP] split defaults testing and completions testing in two separate modules bzr revid: xmo@openerp.com-20120427080911-1n3jpygur493ea29 --- addons/web/static/test/search.js | 63 ++++++++++++++++++++++---------- 1 file changed, 43 insertions(+), 20 deletions(-) diff --git a/addons/web/static/test/search.js b/addons/web/static/test/search.js index 53f32e875d2..276ff3d21b2 100644 --- a/addons/web/static/test/search.js +++ b/addons/web/static/test/search.js @@ -146,15 +146,13 @@ $(document).ready(function () { ]) }); - module('inputs', { + module('defaults', { setup: function () { instance = window.openerp.init([]); window.openerp.web.corelib(instance); window.openerp.web.coresetup(instance); window.openerp.web.chrome(instance); window.openerp.web.data(instance); - // date complete - window.openerp.web.formats(instance); window.openerp.web.search(instance); instance.web.qweb.add_template(doc); @@ -210,7 +208,7 @@ $(document).ready(function () { var dataset = {model: 'dummy.model', get_context: function () { return {}; }}; return new instance.web.SearchView(null, dataset, false, defaults); } - asyncTest('defaults calling', 2, function () { + asyncTest('calling', 2, function () { var defaults_called = false; var view = makeSearchView({ @@ -234,7 +232,7 @@ $(document).ready(function () { "should have generated a facet with the default value"); }); }); - asyncTest('FilterGroup defaults', 3, function () { + asyncTest('FilterGroup', 3, function () { var view = {inputs: []}; var filter_a = new instance.web.search.Filter( {attrs: {name: 'a'}}, view); @@ -256,7 +254,7 @@ $(document).ready(function () { strictEqual(values.at(1).get('value'), filter_b); }); }); - asyncTest('Field default', 4, function () { + asyncTest('Field', 4, function () { var view = {inputs: []}; var f = new instance.web.search.Field( {attrs: {string: 'Dummy', name: 'dummy'}}, {}, view); @@ -282,7 +280,7 @@ $(document).ready(function () { "facet value should match provided default"); }); }); - asyncTest('Selection default: valid value', 4, function () { + asyncTest('Selection: valid value', 4, function () { var view = {inputs: []}; var f = new instance.web.search.SelectionField( {attrs: {name: 'dummy', string: 'Dummy'}}, @@ -310,7 +308,7 @@ $(document).ready(function () { "facet value should match provided default's selection"); }); }); - asyncTest('Selection default: invalid value', 1, function () { + asyncTest('Selection: invalid value', 1, function () { var view = {inputs: []}; var f = new instance.web.search.SelectionField( {attrs: {name: 'dummy', string: 'Dummy'}}, @@ -323,7 +321,7 @@ $(document).ready(function () { ok(!facet, "an invalid value should result in a not-facet"); }); }); - asyncTest("M2O default: valid value", 7, function () { + asyncTest("M2O default: value", 7, function () { var view = {inputs: []}, id = 4; var f = new instance.web.search.ManyToOneField( {attrs: {name: 'dummy', string: 'Dummy'}}, @@ -359,7 +357,7 @@ $(document).ready(function () { "facet value should match provided default's selection"); }); }); - asyncTest("M2O default: invalid value", 1, function () { + asyncTest("M2O default: value", 1, function () { var view = {inputs: []}, id = 4; var f = new instance.web.search.ManyToOneField( {attrs: {name: 'dummy', string: 'Dummy'}}, @@ -375,7 +373,33 @@ $(document).ready(function () { ok(!facet, "an invalid m2o default should yield a non-facet"); }); }); - asyncTest('completion calling', 4, function () { + + module('completions', { + setup: function () { + instance = window.openerp.init([]); + window.openerp.web.corelib(instance); + window.openerp.web.coresetup(instance); + window.openerp.web.chrome(instance); + window.openerp.web.data(instance); + // date complete + window.openerp.web.formats(instance); + window.openerp.web.search(instance); + + instance.web.qweb.add_template(doc); + + instance.connection.responses = {}; + instance.connection.rpc_function = function (url, payload) { + if (!(url.url in this.responses)) { + return $.Deferred().reject( + {}, 'failed', + _.str.sprintf("Url %s not found in mock responses", + url.url)).promise(); + } + return $.when(this.responses[url.url](payload)); + }; + } + }); + asyncTest('calling', 4, function () { var view = makeSearchView({ complete: function () { return $.when({ @@ -407,8 +431,7 @@ $(document).ready(function () { }); }); }); - - asyncTest('completion facet selection', 2, function () { + asyncTest('facet selection', 2, function () { var completion = { label: "Dummy", facet: { @@ -433,7 +456,7 @@ $(document).ready(function () { "should have the right facet in the query"); }); }); - asyncTest('completion facet selection: new value existing facet', 3, function () { + asyncTest('facet selection: new value existing facet', 3, function () { var field = {}; var completion = { label: "Dummy", @@ -463,7 +486,7 @@ $(document).ready(function () { "should have added selected value to old one"); }); }); - asyncTest('Field completion', 1, function () { + asyncTest('Field', 1, function () { var view = {inputs: []}; var f = new instance.web.search.Field({attrs: {}}, {}, view); f.complete('foo') @@ -473,7 +496,7 @@ $(document).ready(function () { ok(_(completions).isEmpty(), "field should not provide any completion"); }); }); - asyncTest('CharField completion', 6, function () { + asyncTest('CharField', 6, function () { var view = {inputs: []}; var f = new instance.web.search.CharField( {attrs: {string: "Dummy"}}, {}, view); @@ -496,7 +519,7 @@ $(document).ready(function () { "facet should have single value using completion item"); }); }); - asyncTest('Selection completion: match found', 14, function () { + asyncTest('Selection: match found', 14, function () { var view = {inputs: []}; var f = new instance.web.search.SelectionField( {attrs: {string: "Dummy"}}, @@ -529,7 +552,7 @@ $(document).ready(function () { deepEqual(c3.facet.values, [{label: "Bazador", value: 4}]); }); }); - asyncTest('Selection completion: no match', 1, function () { + asyncTest('Selection: no match', 1, function () { var view = {inputs: []}; var f = new instance.web.search.SelectionField( {attrs: {string: "Dummy"}}, @@ -542,7 +565,7 @@ $(document).ready(function () { ok(!completions, "if no value matches the needle, no completion shall be provided"); }); }); - asyncTest('Date completion', 6, function () { + asyncTest('Date', 6, function () { instance.web._t.database.parameters = { date_format: '%Y-%m-%d', time_format: '%H:%M:%S' @@ -566,7 +589,7 @@ $(document).ready(function () { new Date(2012, 4, 21, 21, 21, 21).getTime()); }); }); - asyncTest("M2O completion", 15, function () { + asyncTest("M2O", 15, function () { instance.connection.responses['/web/dataset/call_kw'] = function (req) { equal(req.params.method, "name_search"); equal(req.params.model, "dummy.model"); From da37acedf62940c5f074822f10e52520e10a43cf Mon Sep 17 00:00:00 2001 From: Xavier Morel Date: Fri, 27 Apr 2012 10:11:14 +0200 Subject: [PATCH 13/81] [TESTS] m2o completion with no match on name_search bzr revid: xmo@openerp.com-20120427081114-8tn0x6xaky2ivqwm --- addons/web/static/test/search.js | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/addons/web/static/test/search.js b/addons/web/static/test/search.js index 276ff3d21b2..ec93f1a6707 100644 --- a/addons/web/static/test/search.js +++ b/addons/web/static/test/search.js @@ -623,6 +623,24 @@ $(document).ready(function () { deepEqual(f2.values.toJSON(), [{label: 'choice @', value: 43}]); }); }); + asyncTest("M2O no match", 5, function () { + instance.connection.responses['/web/dataset/call_kw'] = function (req) { + equal(req.params.method, "name_search"); + equal(req.params.model, "dummy.model"); + deepEqual(req.params.args, []); + deepEqual(req.params.kwargs.name, 'bob'); + return {result: []} + }; + var view = {inputs: []}; + var f = new instance.web.search.ManyToOneField( + {attrs: {string: 'Dummy'}}, {relation: 'dummy.model'}, view); + f.complete("bob") + .always(start) + .fail(function (error) { ok(false, error.message); }) + .done(function (c) { + ok(!c, "no match should yield no completion"); + }); + }); // TODO: test drawer rendering // TODO: UI tests? From 661eddb330afae1dc0b642ab517abe2cb5365942 Mon Sep 17 00:00:00 2001 From: Xavier Morel Date: Fri, 27 Apr 2012 10:30:24 +0200 Subject: [PATCH 14/81] [REF] extract building of a facet descriptor from m2o/selection pairs into a function bzr revid: xmo@openerp.com-20120427083024-zqq9hs203uaywlbr --- addons/web/static/src/js/search.js | 44 +++++++++++++++--------------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/addons/web/static/src/js/search.js b/addons/web/static/src/js/search.js index 8780e1cbd81..830253e0622 100644 --- a/addons/web/static/src/js/search.js +++ b/addons/web/static/src/js/search.js @@ -1129,6 +1129,22 @@ instance.web.search.FloatField = instance.web.search.NumberField.extend(/** @len } } }); + +/** + * Utility function for m2o & selection fields taking a selection/name_get pair + * (value, name) and converting it to a Facet descriptor + * + * @param {instance.web.search.Field} field holder field + * @param {Array} pair pair value to convert + */ +function facet_from(field, pair) { + return { + field: field, + category: field['attrs'].string, + values: [{label: pair[1], value: pair[0]}] + }; +} + /** * @class * @extends instance.web.search.Field @@ -1163,11 +1179,7 @@ instance.web.search.SelectionField = instance.web.search.Field.extend(/** @lends .map(function (sel) { return { label: sel[1], - facet: { - category: self.attrs.string, - field: self, - values: [{value: sel[0], label: sel[1]}] - } + facet: facet_from(self, sel) }; }).value(); if (_.isEmpty(results)) { return $.when(null); } @@ -1180,11 +1192,7 @@ instance.web.search.SelectionField = instance.web.search.Field.extend(/** @lends return sel[0] === value; }); if (!match) { return $.when(null); } - return $.when({ - category: this.attrs.string, - field: this, - values: [{label: match[1], value: match[0]}] - }); + return $.when(facet_from(this, match)); }, get_value: function (facet) { return facet.get('values'); @@ -1271,27 +1279,19 @@ instance.web.search.ManyToOneField = instance.web.search.CharField.extend({ _(results).map(function (result) { return { label: result[1], - facet: { - category: self.attrs.string, - field: self, - values: [{label: result[1], value: result[0]}] - } + facet: facet_from(self, result) }; })); }); }, facet_for: function (value) { - var self = this, fromPair = function (a) { return { - category: self.attrs.string, - field: self, - values: [{label: a[1], value: a[0]}] - } }; + var self = this; if (value instanceof Array) { - return $.when(fromPair(value)); + return $.when(facet_from(this, value)); } return this.model.call('name_get', [value], {}).pipe(function (names) { if (_(names).isEmpty()) { return null; } - return fromPair(names[0]); + return facet_from(self, names[0]); }) }, make_domain: function (name, operator, facet) { From 1f0b1673e22c1c40a2e94ac69269611de22a7d01 Mon Sep 17 00:00:00 2001 From: Xavier Morel Date: Fri, 27 Apr 2012 17:04:36 +0200 Subject: [PATCH 15/81] [TEST] rendering of drawer bzr revid: xmo@openerp.com-20120427150436-3wxgyyp59l5vefr5 --- addons/web/static/src/js/search.js | 157 ++++++++++++++++------------- addons/web/static/src/xml/base.xml | 5 + addons/web/static/test/search.js | 52 +++++++++- doc/search-view.rst | 16 ++- 4 files changed, 154 insertions(+), 76 deletions(-) diff --git a/addons/web/static/src/js/search.js b/addons/web/static/src/js/search.js index 830253e0622..d6ec3bc981f 100644 --- a/addons/web/static/src/js/search.js +++ b/addons/web/static/src/js/search.js @@ -249,69 +249,10 @@ instance.web.SearchView = instance.web.Widget.extend(/** @lends instance.web.Sea /** * Sets up thingie where all the mess is put? */ - setup_stuff_drawer: function () { - var self = this; - $('
').appendTo(this.$element); - var $drawer = $('
').appendTo(this.$element); - var $filters = $('
').appendTo($drawer); - - var running_count = 0; - // get total filters count - var is_group = function (i) { return i instanceof instance.web.search.FilterGroup; }; - var filters_count = _(this.controls).chain() - .flatten() - .filter(is_group) - .map(function (i) { return i.filters.length; }) - .sum() - .value(); - - var col1 = [], col2 = _(this.controls).map(function (inputs, group) { - var filters = _(inputs).filter(is_group); - return { - name: group === 'null' ? _t("Filters") : group, - filters: filters, - length: _(filters).chain().map(function (i) { - return i.filters.length; }).sum().value() - }; + select_for_drawer: function () { + return _(this.inputs).filter(function (input) { + return input.in_drawer(); }); - - while (col2.length) { - // col1 + group should be smaller than col2 + group - if ((running_count + col2[0].length) <= (filters_count - running_count)) { - running_count += col2[0].length; - col1.push(col2.shift()); - } else { - break; - } - } - - // Create a Custom Filter FilterGroup for each custom filter read from - // the db, add all of this as a group in the smallest column - [].push.call(col1.length <= col2.length ? col1 : col2, { - name: _t("Custom Filters"), - filters: _.map(this.custom_filters, function (filter) { - // FIXME: handling of ``disabled`` being set - var f = new instance.web.search.Filter({attrs: { - string: filter.name, - context: filter.context, - domain: filter.domain - }}, self); - return new instance.web.search.FilterGroup([f], self); - }), - length: 3 - }); - - return $.when( - this.render_column(col1, $('
').appendTo($filters)), - this.render_column(col2, $('
').appendTo($filters)), - (new instance.web.search.Advanced(this).appendTo($drawer))); - }, - render_column: function (column, $el) { - return $.when.apply(null, _(column).map(function (group) { - $('

').text(group.name).appendTo($el); - return $.when.apply(null, - _(group.filters).invoke('appendTo', $el)); - })); }, /** * Sets up search view's view-wide auto-completion widget @@ -479,14 +420,24 @@ instance.web.SearchView = instance.web.Widget.extend(/** @lends instance.web.Sea data.fields_view['arch'].children, data.fields_view.fields); + // add Filters to this.inputs, need view.controls filled + var filters = new instance.web.search.Filters(this); + // add Advanced to this.inputs + var advanced = new instance.web.search.Advanced(this); + + // build drawer + var drawer_started = $.when.apply( + null, _(this.select_for_drawer()).invoke( + 'appendTo', this.$element.find('.oe_searchview_drawer'))); + // load defaults - return $.when( - this.setup_stuff_drawer(), - $.when.apply(null, _(this.inputs).invoke('facet_for_defaults', this.defaults)) - .then(function () { - self.query.reset(_(arguments).compact(), {silent: true}); - self.renderFacets(); - })) + var defaults_fetched = $.when.apply(null, _(this.inputs).invoke( + 'facet_for_defaults', this.defaults)).then(function () { + self.query.reset(_(arguments).compact(), {silent: true}); + self.renderFacets(); + }); + + return $.when(drawer_started, defaults_fetched) .then(function () { self.ready.resolve(); }) }, /** @@ -779,6 +730,7 @@ instance.web.search.Group = instance.web.search.Widget.extend({ }); instance.web.search.Input = instance.web.search.Widget.extend( /** @lends instance.web.search.Input# */{ + _in_drawer: false, /** * @constructs instance.web.search.Input * @extends instance.web.search.Widget @@ -820,6 +772,9 @@ instance.web.search.Input = instance.web.search.Widget.extend( /** @lends instan } return this.facet_for(defaults[this.attrs.name]); }, + in_drawer: function () { + return !!this._in_drawer; + }, get_context: function () { throw new Error( "get_context not implemented for widget " + this.attrs.type); @@ -937,6 +892,7 @@ instance.web.search.FilterGroup = instance.web.search.Input.extend(/** @lends in var self = this, fs; var facet = this.view.query.detect(function (f) { return f.get('field') === self; }); + // just toggle the bloody thing if (facet) { fs = facet.get('values'); @@ -1304,8 +1260,71 @@ instance.web.search.ManyToOneField = instance.web.search.CharField.extend({ } }); +instance.web.search.Filters = instance.web.search.Input.extend({ + template: 'SearchView.Filters', + _in_drawer: true, + start: function () { + var self = this; + var running_count = 0; + // get total filters count + var is_group = function (i) { return i instanceof instance.web.search.FilterGroup; }; + var filters_count = _(this.view.controls).chain() + .flatten() + .filter(is_group) + .map(function (i) { return i.filters.length; }) + .sum() + .value(); + + var col1 = [], col2 = _(this.view.controls).map(function (inputs, group) { + var filters = _(inputs).filter(is_group); + return { + name: group === 'null' ? _t("Filters") : group, + filters: filters, + length: _(filters).chain().map(function (i) { + return i.filters.length; }).sum().value() + }; + }); + + while (col2.length) { + // col1 + group should be smaller than col2 + group + if ((running_count + col2[0].length) <= (filters_count - running_count)) { + running_count += col2[0].length; + col1.push(col2.shift()); + } else { + break; + } + } + + // Create a Custom Filter FilterGroup for each custom filter read from + // the db, add all of this as a group in the smallest column + (col1.length <= col2.length ? col1 : col2).push({ + name: _t("Custom Filters"), + filters: _.map(this.view.custom_filters, function (filter) { + // FIXME: handling of ``disabled`` being set + var f = new instance.web.search.Filter({attrs: { + string: filter.name, + context: filter.context, + domain: filter.domain + }}, self.view); + return new instance.web.search.FilterGroup([f], self.view); + }), + length: this.view.custom_filters.length + }); + return $.when( + this.render_column(col1, $('
').appendTo(this.$element)), + this.render_column(col2, $('
').appendTo(this.$element))); + }, + render_column: function (column, $el) { + return $.when.apply(null, _(column).map(function (group) { + $('

').text(group.name).appendTo($el); + return $.when.apply(null, + _(group.filters).invoke('appendTo', $el)); + })); + } +}); instance.web.search.Advanced = instance.web.search.Input.extend({ template: 'SearchView.advanced', + _in_drawer: true, start: function () { var self = this; this.$element diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml index fcdf68a12ca..c275903c4a3 100644 --- a/addons/web/static/src/xml/base.xml +++ b/addons/web/static/src/xml/base.xml @@ -1291,6 +1291,8 @@
+
+
+
+ +

Advanced Search...

diff --git a/addons/web/static/test/search.js b/addons/web/static/test/search.js index ec93f1a6707..9e4c0b72747 100644 --- a/addons/web/static/test/search.js +++ b/addons/web/static/test/search.js @@ -170,12 +170,24 @@ $(document).ready(function () { } }); + /** + * Builds a basic search view with a single "dummy" field. The dummy + * extends `instance.web.search.Field`, it does not add any (class) + * attributes beyond what is provided through ``dummy_widget_attributes``. + * + * The view is returned un-started, it is the caller's role to start it + * (or use DOM-insertion methods to start it indirectly). + * + * @param [dummy_widget_attributes={}] + * @param [defaults={}] + * @return {instance.web.SearchView} + */ function makeSearchView(dummy_widget_attributes, defaults) { instance.web.search.fields.add( 'dummy', 'instance.dummy.DummyWidget'); instance.dummy = {}; instance.dummy.DummyWidget = instance.web.search.Field.extend( - dummy_widget_attributes); + dummy_widget_attributes || {}); instance.connection.responses['/web/searchview/load'] = function () { return {result: {fields_view: { type: 'search', @@ -642,6 +654,42 @@ $(document).ready(function () { }); }); - // TODO: test drawer rendering + module('drawer', { + setup: function () { + instance = window.openerp.init([]); + window.openerp.web.corelib(instance); + window.openerp.web.coresetup(instance); + window.openerp.web.chrome(instance); + window.openerp.web.data(instance); + window.openerp.web.search(instance); + + instance.web.qweb.add_template(doc); + + instance.connection.responses = {}; + instance.connection.rpc_function = function (url, payload) { + if (!(url.url in this.responses)) { + return $.Deferred().reject( + {}, 'failed', + _.str.sprintf("Url %s not found in mock responses", + url.url)).promise(); + } + return $.when(this.responses[url.url](payload)); + }; + } + }); + asyncTest('is-drawn', 2, function () { + var view = makeSearchView(); + var $fix = $('#qunit-fixture'); + view.appendTo($fix) + .always(start) + .fail(function (error) { ok(false, error.message); }) + .done(function () { + ok($fix.find('.oe_searchview_filters').length, + "filters drawer control has been drawn"); + ok($fix.find('.oe_searchview_advanced').length, + "filters advanced search has been drawn"); + }); + }); + // TODO: UI tests? }); diff --git a/doc/search-view.rst b/doc/search-view.rst index 9d5944d41d6..a7fbb77f51b 100644 --- a/doc/search-view.rst +++ b/doc/search-view.rst @@ -122,12 +122,18 @@ rendered inside the drawer. second more usual calendar widget in the drawer for more obvious/precise interactions) -Any input can note its desire to be rendered in the drawer by setting -its :js:attr:`~openerp.web.search.Input.in_drawer` attribute to -``true``, either on its class or on its instance. +Any input can note its desire to be rendered in the drawer by +returning a truthy value from +:js:func:`~openerp.web.search.Input.in_drawer`. -It will be rendered in the full width of the drawer, and instantiated -only once. +By default, :js:func:`~openerp.web.search.Input.in_drawer` returns the +value of :js:attr:`~openerp.web.search.Input._in_drawer`, which is +``false``. The behavior can be toggled either by redefining the +attribute to ``true`` (either on the class or on the input), or by +overriding :js:func:`~openerp.web.search.Input.in_drawer` itself. + +The input will be rendered in the full width of the drawer, it will be +started only once (per view). .. todo:: drawer API (if a widget wants to close the drawer in some way), part of the low-level SearchView API/interactions? From 7dd114798d105466ece62b35d4238a50321f6894 Mon Sep 17 00:00:00 2001 From: Xavier Morel Date: Fri, 27 Apr 2012 17:36:38 +0200 Subject: [PATCH 16/81] [TEST] toggling of filters within a group bzr revid: xmo@openerp.com-20120427153638-bkm6x2dfqf4tnjw9 --- addons/web/static/src/js/search.js | 31 +----- addons/web/static/test/search.js | 165 +++++++++++++++++++++++++---- 2 files changed, 147 insertions(+), 49 deletions(-) diff --git a/addons/web/static/src/js/search.js b/addons/web/static/src/js/search.js index d6ec3bc981f..39d67a08f7d 100644 --- a/addons/web/static/src/js/search.js +++ b/addons/web/static/src/js/search.js @@ -888,35 +888,10 @@ instance.web.search.FilterGroup = instance.web.search.Input.extend(/** @lends in this.toggle(this.filters[$(e.target).index()]); }, toggle: function (filter) { - // FIXME: oh god, my eyes, they hurt - var self = this, fs; - var facet = this.view.query.detect(function (f) { - return f.get('field') === self; }); - // just toggle the bloody thing - if (facet) { - fs = facet.get('values'); - - if (_.include(fs, filter)) { - fs = _.without(fs, filter); - } else { - fs.push(filter); - } - if (_(fs).isEmpty()) { - this.view.query.remove(facet, {trigger_search: true}); - } else { - facet.set({ - values: fs - }); - } - return; - } else { - fs = [filter]; - } - - this.view.query.add({ + this.view.query.toggle({ category: _t("Filter"), - values: fs, - field: this + field: this, + values: [{label: filter.attrs.string, value: filter}] }); } }); diff --git a/addons/web/static/test/search.js b/addons/web/static/test/search.js index 9e4c0b72747..1dcf03f90bd 100644 --- a/addons/web/static/test/search.js +++ b/addons/web/static/test/search.js @@ -188,28 +188,30 @@ $(document).ready(function () { instance.dummy = {}; instance.dummy.DummyWidget = instance.web.search.Field.extend( dummy_widget_attributes || {}); - instance.connection.responses['/web/searchview/load'] = function () { - return {result: {fields_view: { - type: 'search', - fields: { - dummy: {type: 'char'} - }, - arch: { - tag: 'search', - attrs: {}, - children: [{ - tag: 'field', - attrs: { - name: 'dummy', - widget: 'dummy' - }, - children: [] - }] - } - }}}; - }; + if (!('/web/searchview/load' in instance.connection.responses)) { + instance.connection.responses['/web/searchview/load'] = function () { + return {result: {fields_view: { + type: 'search', + fields: { + dummy: {type: 'char'} + }, + arch: { + tag: 'search', + attrs: {}, + children: [{ + tag: 'field', + attrs: { + name: 'dummy', + widget: 'dummy' + }, + children: [] + }] + } + }}}; + }; + } instance.connection.responses['/web/searchview/get_filters'] = function () { - return []; + return {result: []}; }; instance.connection.responses['/web/searchview/fields_get'] = function () { return {result: {fields: { @@ -691,5 +693,126 @@ $(document).ready(function () { }); }); + module('filters', { + setup: function () { + instance = window.openerp.init([]); + window.openerp.web.corelib(instance); + window.openerp.web.coresetup(instance); + window.openerp.web.chrome(instance); + window.openerp.web.data(instance); + window.openerp.web.search(instance); + + instance.web.qweb.add_template(doc); + + instance.connection.responses = {}; + instance.connection.rpc_function = function (url, payload) { + if (!(url.url in this.responses)) { + return $.Deferred().reject( + {}, 'failed', + _.str.sprintf("Url %s not found in mock responses", + url.url)).promise(); + } + return $.when(this.responses[url.url](payload)); + }; + instance.connection.responses['/web/searchview/load'] = function () { + // view with a single group of filters + return {result: {fields_view: { + type: 'search', + fields: {}, + arch: { + tag: 'search', + attrs: {}, + children: [{ + tag: 'filter', + attrs: { string: "Foo1", domain: [ ['foo', '=', '1'] ] }, + children: [] + }, { + tag: 'filter', + attrs: { + name: 'foo2', + string: "Foo2", + domain: [ ['foo', '=', '2'] ] }, + children: [] + }, { + tag: 'filter', + attrs: { string: "Foo3", domain: [ ['foo', '=', '3'] ] }, + children: [] + }] + } + }}}; + }; + } + }); + asyncTest('drawn', 3, function () { + var view = makeSearchView(); + var $fix = $('#qunit-fixture'); + view.appendTo($fix) + .always(start) + .fail(function (error) { ok(false, error.message); }) + .done(function () { + var $fs = $fix.find('.oe_searchview_filters ul'); + // 3 filters, 1 filtergroup, 1 advanced and 1 Filters widget + equal(view.inputs.length, 6, + 'view should have 6 inputs total'); + equal($fs.children().length, 3, + "drawer should have a filter group with 3 filters"); + equal(_.str.strip($fs.children().eq(0).text()), "Foo1", + "Text content of first filter option should match filter string"); + }); + }); + asyncTest('click adding from empty query', 4, function () { + var view = makeSearchView(); + var $fix = $('#qunit-fixture'); + view.appendTo($fix) + .always(start) + .fail(function (error) { ok(false, error.message); }) + .done(function () { + var $fs = $fix.find('.oe_searchview_filters ul'); + $fs.children(':eq(2)').trigger('click'); + equal(view.query.length, 1, "click should have added a facet"); + var facet = view.query.at(0); + equal(facet.values.length, 1, "facet should have a single value"); + var value = facet.values.at(0); + ok(value.get('value') instanceof instance.web.search.Filter, + "value should be a filter"); + equal(value.get('label'), "Foo3", + "value should be third filter"); + }); + }); + asyncTest('click adding from existing query', 4, function () { + var view = makeSearchView({}, {foo2: true}); + var $fix = $('#qunit-fixture'); + view.appendTo($fix) + .always(start) + .fail(function (error) { ok(false, error.message); }) + .done(function () { + var $fs = $fix.find('.oe_searchview_filters ul'); + $fs.children(':eq(2)').trigger('click'); + equal(view.query.length, 1, "click should not have changed facet count"); + var facet = view.query.at(0); + equal(facet.values.length, 2, "facet should have a second value"); + var v1 = facet.values.at(0); + equal(v1.get('label'), "Foo2", + "first value should be default"); + var v2 = facet.values.at(1); + equal(v2.get('label'), "Foo3", + "second value should be clicked filter"); + }); + }); + asyncTest('click removing from query', 2, function () { + var view = makeSearchView({}, {foo2: true}); + var $fix = $('#qunit-fixture'); + view.appendTo($fix) + .always(start) + .fail(function (error) { ok(false, error.message); }) + .done(function () { + var $fs = $fix.find('.oe_searchview_filters ul'); + // sanity check + equal(view.query.length, 1, "query should have default facet"); + $fs.children(':eq(1)').trigger('click'); + equal(view.query.length, 0, "click should have removed facet"); + }); + }); + // TODO: UI tests? }); From 15cf79717f0410c13773918bd6cdd99f1e55b5c1 Mon Sep 17 00:00:00 2001 From: Xavier Morel Date: Fri, 27 Apr 2012 17:37:58 +0200 Subject: [PATCH 17/81] [FIX] label of async DropMisordered tests bzr revid: xmo@openerp.com-20120427153758-tj7rp5grryx680f9 --- addons/web/static/test/rpc.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/addons/web/static/test/rpc.js b/addons/web/static/test/rpc.js index 8a49a48685f..fbe7147f2e6 100644 --- a/addons/web/static/test/rpc.js +++ b/addons/web/static/test/rpc.js @@ -66,7 +66,7 @@ $(document).ready(function () { ok(!fail2); }); - asyncTest('Resolve all correctly ordered, sync', 1, function () { + asyncTest('Resolve all correctly ordered, async', 1, function () { var dm = new openerp.web.DropMisordered(); var d1 = $.Deferred(), d2 = $.Deferred(), @@ -80,7 +80,7 @@ $(document).ready(function () { ok(true); }); }); - asyncTest("Don't resolve mis-ordered, sync", 4, function () { + asyncTest("Don't resolve mis-ordered, async", 4, function () { var dm = new openerp.web.DropMisordered(), done1 = false, done2 = false, fail1 = false, fail2 = false; @@ -104,7 +104,7 @@ $(document).ready(function () { ok(!fail2); }, 400); }); - asyncTest('Fail mis-ordered flag, sync', 4, function () { + asyncTest('Fail mis-ordered flag, async', 4, function () { var dm = new openerp.web.DropMisordered(true), done1 = false, done2 = false, fail1 = false, fail2 = false; From 24e104fcbe4b263a7f522c0a41649890373bca0d Mon Sep 17 00:00:00 2001 From: Xavier Morel Date: Fri, 27 Apr 2012 17:46:14 +0200 Subject: [PATCH 18/81] [IMP] alias backbone to ensure searchview doesn't care about POS stomping an old-as-shit backbone on top of the more recent one bundled with core bzr revid: xmo@openerp.com-20120427154614-otxpbsc9lio9azko --- addons/web/static/src/js/search.js | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/addons/web/static/src/js/search.js b/addons/web/static/src/js/search.js index 39d67a08f7d..24d3212f9a4 100644 --- a/addons/web/static/src/js/search.js +++ b/addons/web/static/src/js/search.js @@ -9,18 +9,19 @@ _.mixin({ /** @namespace */ var my = instance.web.search = {}; -my.FacetValue = Backbone.Model.extend({ +var B = Backbone; +my.FacetValue = B.Model.extend({ }); -my.FacetValues = Backbone.Collection.extend({ +my.FacetValues = B.Collection.extend({ model: my.FacetValue }); -my.Facet = Backbone.Model.extend({ +my.Facet = B.Model.extend({ initialize: function (attrs) { var values = attrs.values; delete attrs.values; - Backbone.Model.prototype.initialize.apply(this, arguments); + B.Model.prototype.initialize.apply(this, arguments); this.values = new my.FacetValues(values || []); this.values.on('add remove change reset', function () { @@ -29,13 +30,13 @@ my.Facet = Backbone.Model.extend({ }, get: function (key) { if (key !== 'values') { - return Backbone.Model.prototype.get.call(this, key); + return B.Model.prototype.get.call(this, key); } return this.values.toJSON(); }, set: function (key, value) { if (key !== 'values') { - return Backbone.Model.prototype.set.call(this, key, value); + return B.Model.prototype.set.call(this, key, value); } this.values.reset(value); }, @@ -52,10 +53,10 @@ my.Facet = Backbone.Model.extend({ return out; } }); -my.SearchQuery = Backbone.Collection.extend({ +my.SearchQuery = B.Collection.extend({ model: my.Facet, initialize: function () { - Backbone.Collection.prototype.initialize.apply( + B.Collection.prototype.initialize.apply( this, arguments); this.on('change', function (facet) { if(!facet.values.isEmpty()) { return; } @@ -79,7 +80,7 @@ my.SearchQuery = Backbone.Collection.extend({ previous.values.add(model.get('values')); return; } - Backbone.Collection.prototype.add.call(this, model, options); + B.Collection.prototype.add.call(this, model, options); }, this); return this; }, From b7626a59c36113eb655172780693fb5d27ce8b1c Mon Sep 17 00:00:00 2001 From: Xavier Morel Date: Mon, 30 Apr 2012 16:39:07 +0200 Subject: [PATCH 19/81] [IMP] style search view/query bzr revid: xmo@openerp.com-20120430143907-xqqyvtgazos70knw --- addons/web/static/src/css/base.css | 151 +++++++++++++------------- addons/web/static/src/css/base.sass | 159 +++++++++++++--------------- addons/web/static/src/js/search.js | 2 +- addons/web/static/src/xml/base.xml | 11 +- 4 files changed, 154 insertions(+), 169 deletions(-) diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css index 1a5136f93e4..ee6009f349a 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -1049,45 +1049,61 @@ position: relative; float: right; padding-right: 20px; - background: white; -} -.openerp .oe_searchview .VS-search .VS-search-box { - min-height: 0; - border-width: 1px; - padding: 0; width: 410px; + border: 1px solid #ababab; + background: white; + -moz-border-radius: 1em; + -webkit-border-radius: 1em; + border-radius: 1em; + -moz-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.2) inset; + -webkit-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.2) inset; + -box-shadow: 0 1px 2px rgba(0, 0, 0, 0.2) inset; } -.openerp .oe_searchview .VS-search .VS-icon { - top: 5px; +.openerp .oe_searchview:before { + color: #cccccc; + font-family: "mnmliconsRegular"; + content: "r"; + font-size: 150%; + padding: 0 1px 0 3px; + display: inline; } -.openerp .oe_searchview .VS-search .VS-icon-search { - left: 5px; +.openerp .oe_searchview .oe_searchview_clear { + cursor: pointer; + position: absolute; + top: 0; + right: 22px; + width: 15px; + height: 100%; + background: url(../img/attachments-close.png) center center no-repeat; } -.openerp .oe_searchview .VS-search .VS-search-inner { - margin: 0 40px 0 17px; - font-size: 13px; +.openerp .oe_searchview .oe_searchview_unfold_drawer { + position: absolute; + top: 0; + right: 0; + height: 100%; + line-height: 2em; + padding: 0 7px 0 4px; + color: #cccccc; + cursor: pointer; } -.openerp .oe_searchview .VS-search .VS-search-inner input { - font-size: inherit; - line-height: inherit; - height: auto; - padding: 0; +.openerp .oe_searchview .oe_searchview_unfold_drawer:hover { + color: #999999; } -.openerp .oe_searchview .VS-search .VS-search-inner .VS-input-width-tester { - font-size: inherit; - padding: 0; +.openerp .oe_searchview .oe_searchview_unfold_drawer:before { + content: "▾"; } -.openerp .oe_searchview .VS-search .VS-search-inner .search_input { - margin-left: 0; - height: 22px; +.openerp .oe_searchview .oe_searchview_facets { + display: inline-block; } -.openerp .oe_searchview .VS-search .VS-search-inner .search_input input, .openerp .oe_searchview .VS-search .VS-search-inner .search_input .VS-input-width-tester { - padding: 0 2px; - height: inherit; - margin: 0; +.openerp .oe_searchview .oe_searchview_input { + height: 2em; + min-width: 5px; + display: inline-block; } -.openerp .oe_searchview .VS-search .VS-search-inner .search_facet { - padding: 0; +.openerp .oe_searchview .oe_searchview_facet { + position: relative; + cursor: pointer; + display: inline-block; margin: 1px 0; border: 1px solid #afafb6; -moz-border-radius: 3px; @@ -1095,59 +1111,40 @@ border-radius: 3px; background: #f0f0fa; height: 18px; + line-height: 18px; } -.openerp .oe_searchview .VS-search .VS-search-inner .search_facet.is_selected { +.openerp .oe_searchview .oe_searchview_facet span { + display: inline-block; + height: 18px; +} +.openerp .oe_searchview .oe_searchview_facet span span { + border-left: 1px solid #afafb6; + padding: 0 4px; +} +.openerp .oe_searchview .oe_searchview_facet .oe_facet_remove { + position: absolute; + top: 0; + left: 2px; + color: white; +} +.openerp .oe_searchview .oe_searchview_facet .oe_facet_remove:hover { + color: #cccccc; +} +.openerp .oe_searchview .oe_searchview_facet .oe_facet_category { + padding: 0 4px 0 14px; + color: white; + background: #8786b7; + text-shadow: 0 1px 1px rgba(0, 0, 0, 0.4); +} +.openerp .oe_searchview .oe_searchview_facet.oe_is_selected { border-color: #a6a6fe; -moz-box-shadow: 0 0 3px 1px #a6a6fe; -webkit-box-shadow: 0 0 3px 1px #a6a6fe; -box-shadow: 0 0 3px 1px #a6a6fe; } -.openerp .oe_searchview .VS-search .VS-search-inner .search_facet.is_selected .category { +.openerp .oe_searchview .oe_searchview_facet.oe_is_selected .oe_facet_category { margin-left: 0; } -.openerp .oe_searchview .VS-search .VS-search-inner .search_facet.is_selected .VS-icon-cancel { - filter: alpha(opacity=100); - opacity: 1; - background-position: center 0; -} -.openerp .oe_searchview .VS-search .VS-search-inner .search_facet .category { - padding: 0 4px 0 14px; - color: white; - background: #8786b7; - text-shadow: 0 1px 1px rgba(0, 0, 0, 0.4); - font-weight: normal; - text-transform: none; - height: 18px; - line-height: 18px; - font-size: inherit; -} -.openerp .oe_searchview .VS-search .VS-search-inner .search_facet .search_facet_input_container { - border-left: 1px solid #afafb6; - height: 18px; - line-height: 18px; - padding: 0 4px; - cursor: pointer; -} -.openerp .oe_searchview .VS-search .VS-search-inner .search_facet .search_facet_remove { - left: 1px; - top: 3px; -} -.openerp .oe_searchview .VS-search .VS-icon-cancel { - right: 24px; -} -.openerp .oe_searchview .oe_searchview_unfold_drawer { - position: absolute; - top: 0; - right: 0; - height: 100%; - line-height: 23px; - padding: 0 7px 0 4px; - color: #cccccc; - cursor: pointer; -} -.openerp .oe_searchview .oe_searchview_unfold_drawer:before { - content: "▾"; -} .openerp .oe_searchview.oe_searchview_open_drawer .oe_searchview_drawer { display: block; } @@ -1200,7 +1197,7 @@ .openerp .oe_searchview .oe_searchview_drawer .oe_searchview_advanced h4:before { content: "▸ "; } -.openerp .oe_searchview .oe_searchview_drawer .oe_searchview_advanced div { +.openerp .oe_searchview .oe_searchview_drawer .oe_searchview_advanced form { display: none; } .openerp .oe_searchview .oe_searchview_drawer .oe_searchview_advanced button.oe_add_condition:before { @@ -1220,7 +1217,7 @@ .openerp .oe_searchview .oe_searchview_drawer .oe_searchview_advanced.oe_opened h4:before { content: "▾ "; } -.openerp .oe_searchview .oe_searchview_drawer .oe_searchview_advanced.oe_opened div { +.openerp .oe_searchview .oe_searchview_drawer .oe_searchview_advanced.oe_opened form { display: block; } .openerp .oe_view_topbar { diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index ee38da2cc56..8aa40b6dae8 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -822,106 +822,91 @@ $colour4: #8a89ba position: relative float: right padding-right: 20px + width: 410px + border: 1px solid #ababab background: white - .VS-search - .VS-search-box - min-height: 0 - border-width: 1px - padding: 0 - width: 410px - //border: 1px solid #ababab - //margin-top: 0 - //margin-bottom: 0 - //padding: 4px 19px - //font-size: 13px - //background: url('../img/search.png') no-repeat 5px - //background-color: white - //@include radius(13px) - //@include box-shadow(0 1px 2px rgba(0,0,0,0.2) inset) - .VS-icon - top: 5px + @include radius(1em) + @include box-shadow(0 1px 2px rgba(0,0,0,0.2) inset) - .VS-icon-search - left: 5px + &:before + color: #ccc + font-family: "mnmliconsRegular" + content: "r" + font-size: 150% + padding: 0 1px 0 3px + display: inline - .VS-search-inner - margin: 0 40px 0 17px - font-size: 13px - - input - font-size: inherit - line-height: inherit - height: auto - padding: 0 - - .VS-input-width-tester - font-size: inherit - padding: 0 - - .search_input - margin-left: 0 - height: 22px - input, .VS-input-width-tester - padding: 0 2px - height: inherit - margin: 0 - - .search_facet - padding: 0 - margin: 1px 0 - border: 1px solid $facets-border - @include radius(3px) - background: #f0f0fa - height: 18px - - &.is_selected - border-color: $facets-border-selected - @include box-shadow(0 0 3px 1px $facets-border-selected) - - .category - margin-left: 0 - .VS-icon-cancel - // don't change the icon on selection - @include opacity(1.0) - background-position: center 0 - - .category - padding: 0 4px 0 14px - color: white - background: #8786b7 - text-shadow: 0 1px 1px rgba(0, 0, 0, 0.4) - font-weight: normal - text-transform: none - height: 18px - line-height: 18px - font-size: inherit - - .search_facet_input_container - border-left: 1px solid $facets-border - height: 18px - line-height: 18px - padding: 0 4px - cursor: pointer - - .search_facet_remove - left: 1px - top: 3px - - .VS-icon-cancel - right: 24px + .oe_searchview_clear + cursor: pointer + position: absolute + top: 0 + right: 22px + width: 15px + height: 100% + background: url(../img/attachments-close.png) center center no-repeat .oe_searchview_unfold_drawer position: absolute top: 0 right: 0 height: 100% - line-height: 23px + line-height: 2em padding: 0 7px 0 4px color: #ccc cursor: pointer + &:hover + color: #999 &:before content: "▾" + .oe_searchview_facets + display: inline-block + + .oe_searchview_input + height: 2em + min-width: 5px + display: inline-block + + .oe_searchview_facet + position: relative + cursor: pointer + display: inline-block + margin: 1px 0 + border: 1px solid $facets-border + @include radius(3px) + background: #f0f0fa + height: 18px + line-height: 18px + + span + display: inline-block + height: 18px + span + border-left: 1px solid $facets-border + padding: 0 4px + + .oe_facet_remove + position: absolute + top: 0 + left: 2px + color: white + + &:hover + color: #ccc + + .oe_facet_category + padding: 0 4px 0 14px + color: white + background: #8786b7 + text-shadow: 0 1px 1px rgba(0, 0, 0, 0.4) + + &.oe_is_selected + border-color: $facets-border-selected + @include box-shadow(0 0 3px 1px $facets-border-selected) + + .oe_facet_category + margin-left: 0 + &.oe_searchview_open_drawer .oe_searchview_drawer display: block @@ -974,7 +959,7 @@ $colour4: #8a89ba h4:before content: "▸ " - div + form display: none button.oe_add_condition:before @@ -992,7 +977,7 @@ $colour4: #8a89ba &.oe_opened h4:before content: "▾ " - div + form display: block // }}} // View.topbar {{{ diff --git a/addons/web/static/src/js/search.js b/addons/web/static/src/js/search.js index 24d3212f9a4..e4ba54c9b9b 100644 --- a/addons/web/static/src/js/search.js +++ b/addons/web/static/src/js/search.js @@ -133,7 +133,7 @@ my.FacetView = instance.web.Widget.extend({ }, start: function () { var self = this; - var $e = self.$element.find('span'); + var $e = self.$element.find('> span:last-child'); var q = $.when(this._super()); return q.pipe(function () { var values = self.model.values.map(function (value) { diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml index c275903c4a3..66502ea033c 100644 --- a/addons/web/static/src/xml/base.xml +++ b/addons/web/static/src/xml/base.xml @@ -1291,18 +1291,21 @@
+
- : + class="oe_searchview_facet"> + ✖ + + + +
From 8be95a554916bab47f3a86e235d0644b1577c357 Mon Sep 17 00:00:00 2001 From: Xavier Morel Date: Mon, 30 Apr 2012 17:03:30 +0200 Subject: [PATCH 20/81] [ADD] facet removal bzr revid: xmo@openerp.com-20120430150330-qdypxzwvrd4x4hkz --- addons/web/static/src/js/search.js | 8 ++++++++ addons/web/static/src/xml/base.xml | 1 - 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/addons/web/static/src/js/search.js b/addons/web/static/src/js/search.js index e4ba54c9b9b..df92ecbb014 100644 --- a/addons/web/static/src/js/search.js +++ b/addons/web/static/src/js/search.js @@ -237,6 +237,14 @@ instance.web.SearchView = instance.web.Widget.extend(/** @lends instance.web.Sea this.$element.on('click', '.oe_searchview_unfold_drawer', function () { self.$element.toggleClass('oe_searchview_open_drawer'); }); + this.$element.on('click', '.oe_facet_remove', function () { + // get index of clicked facet: number of preceding facet siblings + var index = $(this).closest('.oe_searchview_facet') + .prevAll('.oe_searchview_facet') + .length; + self.query.remove( + self.query.at(index), {trigger_search: true}); + }); return $.when(p, this.ready); }, diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml index 66502ea033c..43078730337 100644 --- a/addons/web/static/src/xml/base.xml +++ b/addons/web/static/src/xml/base.xml @@ -1304,7 +1304,6 @@ ✖ -
From 7064a5b85e3bde77701e268789352a9ff8a3cd39 Mon Sep 17 00:00:00 2001 From: Xavier Morel Date: Mon, 30 Apr 2012 17:06:13 +0200 Subject: [PATCH 21/81] [FIX] filter name fallback if there is no string on the filter bzr revid: xmo@openerp.com-20120430150613-ifvar5ncjtakzpki --- addons/web/static/src/js/search.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/addons/web/static/src/js/search.js b/addons/web/static/src/js/search.js index df92ecbb014..1b83a0ec380 100644 --- a/addons/web/static/src/js/search.js +++ b/addons/web/static/src/js/search.js @@ -900,7 +900,10 @@ instance.web.search.FilterGroup = instance.web.search.Input.extend(/** @lends in this.view.query.toggle({ category: _t("Filter"), field: this, - values: [{label: filter.attrs.string, value: filter}] + values: [{ + label: filter.attrs.string || filter.attrs.name, + value: filter + }] }); } }); From a4918562a05094fb11cf24ca969df619aff8453c Mon Sep 17 00:00:00 2001 From: Xavier Morel Date: Mon, 30 Apr 2012 17:59:12 +0200 Subject: [PATCH 22/81] [ADD] selection/deselection of facets bzr revid: xmo@openerp.com-20120430155912-c6tbyaqul6jc329u --- addons/web/static/src/css/base.css | 9 ++++++--- addons/web/static/src/css/base.sass | 6 ++++-- addons/web/static/src/js/search.js | 23 +++++++++++++++++++++-- 3 files changed, 31 insertions(+), 7 deletions(-) diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css index ee6009f349a..d8b91b2ff8b 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -1097,9 +1097,12 @@ } .openerp .oe_searchview .oe_searchview_input { height: 2em; - min-width: 5px; + padding: 0 3px; display: inline-block; } +.openerp .oe_searchview .oe_searchview_input:focus { + outline: none; +} .openerp .oe_searchview .oe_searchview_facet { position: relative; cursor: pointer; @@ -1136,13 +1139,13 @@ background: #8786b7; text-shadow: 0 1px 1px rgba(0, 0, 0, 0.4); } -.openerp .oe_searchview .oe_searchview_facet.oe_is_selected { +.openerp .oe_searchview .oe_searchview_facet.oe_selected { border-color: #a6a6fe; -moz-box-shadow: 0 0 3px 1px #a6a6fe; -webkit-box-shadow: 0 0 3px 1px #a6a6fe; -box-shadow: 0 0 3px 1px #a6a6fe; } -.openerp .oe_searchview .oe_searchview_facet.oe_is_selected .oe_facet_category { +.openerp .oe_searchview .oe_searchview_facet.oe_selected .oe_facet_category { margin-left: 0; } .openerp .oe_searchview.oe_searchview_open_drawer .oe_searchview_drawer { diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index 8aa40b6dae8..b32f1d597c5 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -864,8 +864,10 @@ $colour4: #8a89ba .oe_searchview_input height: 2em - min-width: 5px + padding: 0 3px display: inline-block + &:focus + outline: none .oe_searchview_facet position: relative @@ -900,7 +902,7 @@ $colour4: #8a89ba background: #8786b7 text-shadow: 0 1px 1px rgba(0, 0, 0, 0.4) - &.oe_is_selected + &.oe_selected border-color: $facets-border-selected @include box-shadow(0 0 3px 1px $facets-border-selected) diff --git a/addons/web/static/src/js/search.js b/addons/web/static/src/js/search.js index 1b83a0ec380..c617c5e579b 100644 --- a/addons/web/static/src/js/search.js +++ b/addons/web/static/src/js/search.js @@ -118,7 +118,15 @@ my.SearchQuery = B.Collection.extend({ }); my.InputView = instance.web.Widget.extend({ - template: 'SearchView.InputView' + template: 'SearchView.InputView', + start: function () { + var self = this; + var p = this._super.apply(this, arguments); + this.$element.on('focus', function () { + self.$element.siblings().trigger('deselect'); + }); + return p; + } }); my.FacetView = instance.web.Widget.extend({ template: 'SearchView.FacetView', @@ -133,6 +141,16 @@ my.FacetView = instance.web.Widget.extend({ }, start: function () { var self = this; + this.$element.on('deselect', function () { + self.$element.removeClass('oe_selected'); + }); + this.$element.on('click', function (e) { + if ($(e.target).is('.oe_facet_remove')) { + return; + } + self.$element.siblings().trigger('deselect'); + self.$element.addClass('oe_selected'); + }); var $e = self.$element.find('> span:last-child'); var q = $.when(this._super()); return q.pipe(function () { @@ -237,7 +255,8 @@ instance.web.SearchView = instance.web.Widget.extend(/** @lends instance.web.Sea this.$element.on('click', '.oe_searchview_unfold_drawer', function () { self.$element.toggleClass('oe_searchview_open_drawer'); }); - this.$element.on('click', '.oe_facet_remove', function () { + this.$element.on('click', '.oe_facet_remove', function (e) { + e.stopImmediatePropagation(); // get index of clicked facet: number of preceding facet siblings var index = $(this).closest('.oe_searchview_facet') .prevAll('.oe_searchview_facet') From d28498ffb17920532c0a8d8f48b7378527d289c7 Mon Sep 17 00:00:00 2001 From: Xavier Morel Date: Wed, 2 May 2012 12:58:47 +0200 Subject: [PATCH 23/81] [IMP] wrapping of facets by moving the spyglass icon thing in the facets container bzr revid: xmo@openerp.com-20120502105847-4d95n628c6ituyp0 --- addons/web/static/src/css/base.css | 16 ++++++++-------- addons/web/static/src/css/base.sass | 15 +++++++-------- 2 files changed, 15 insertions(+), 16 deletions(-) diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css index d8b91b2ff8b..20b4cb92ff4 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -1059,14 +1059,6 @@ -webkit-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.2) inset; -box-shadow: 0 1px 2px rgba(0, 0, 0, 0.2) inset; } -.openerp .oe_searchview:before { - color: #cccccc; - font-family: "mnmliconsRegular"; - content: "r"; - font-size: 150%; - padding: 0 1px 0 3px; - display: inline; -} .openerp .oe_searchview .oe_searchview_clear { cursor: pointer; position: absolute; @@ -1095,6 +1087,14 @@ .openerp .oe_searchview .oe_searchview_facets { display: inline-block; } +.openerp .oe_searchview .oe_searchview_facets:before { + color: #cccccc; + font-family: "mnmliconsRegular"; + content: "r"; + font-size: 150%; + padding: 0 1px 0 3px; + display: inline; +} .openerp .oe_searchview .oe_searchview_input { height: 2em; padding: 0 3px; diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index b32f1d597c5..eabcae107b7 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -828,14 +828,6 @@ $colour4: #8a89ba @include radius(1em) @include box-shadow(0 1px 2px rgba(0,0,0,0.2) inset) - &:before - color: #ccc - font-family: "mnmliconsRegular" - content: "r" - font-size: 150% - padding: 0 1px 0 3px - display: inline - .oe_searchview_clear cursor: pointer position: absolute @@ -861,6 +853,13 @@ $colour4: #8a89ba .oe_searchview_facets display: inline-block + &:before + color: #ccc + font-family: "mnmliconsRegular" + content: "r" + font-size: 150% + padding: 0 1px 0 3px + display: inline .oe_searchview_input height: 2em From 25a30ad0ced6075ea770da1c59b1f078b407dc9c Mon Sep 17 00:00:00 2001 From: Xavier Morel Date: Wed, 2 May 2012 15:12:26 +0200 Subject: [PATCH 24/81] [ADD] autocompletion correctly using input values bzr revid: xmo@openerp.com-20120502131226-w4agkq7qq5ni8nwl --- addons/web/static/src/js/search.js | 33 ++++++++++++++++++++++-------- 1 file changed, 25 insertions(+), 8 deletions(-) diff --git a/addons/web/static/src/js/search.js b/addons/web/static/src/js/search.js index c617c5e579b..93e1caec290 100644 --- a/addons/web/static/src/js/search.js +++ b/addons/web/static/src/js/search.js @@ -286,13 +286,23 @@ instance.web.SearchView = instance.web.Widget.extend(/** @lends instance.web.Sea * Sets up search view's view-wide auto-completion widget */ setup_global_completion: function () { - // Prevent keydown from within a facet's input from reaching the - // auto-completion widget and opening the completion list - this.$element.on('keydown', '.search_facet input', function (e) { - e.stopImmediatePropagation(); + var self = this; + + // autocomplete only correctly handles being initialized on the actual + // editable element (and only an element with a @value in 1.8 e.g. + // input or textarea), cheat by setting val() on $element + this.$element.on('keydown', function () { + // keydown is triggered *before* the element's value is set, so + // delay this. Pray that setTimeout are executed in FIFO (if they + // have the same delay) as autocomplete uses the exact same trick. + // FIXME: brittle as fuck + setTimeout(function () { + self.$element.val(self.currentInputValue()); + }, 0); + }); - this.$element.autocomplete({ + var completer = this.$element.autocomplete({ source: this.proxy('complete_global_search'), select: this.proxy('select_completion'), focus: function (e) { e.preventDefault(); }, @@ -305,14 +315,14 @@ instance.web.SearchView = instance.web.Widget.extend(/** @lends instance.web.Sea .data( "item.autocomplete", item ) .appendTo( ul ); - if (item.value !== undefined) { + if (item.facet !== undefined) { // regular completion item return $item.append( (item.label) ? $('').html(item.label) : $('').text(item.value)); } - return $item.text(item.category) + return $item.text(item.label) .css({ borderTop: '1px solid #cccccc', margin: 0, @@ -322,7 +332,14 @@ instance.web.SearchView = instance.web.Widget.extend(/** @lends instance.web.Sea clear: 'left', width: '100%' }); - } + }; + }, + /** + * Gets value out of the currently focused "input" (a + * div[contenteditable].oe_searchview_input) + */ + currentInputValue: function () { + return this.$element.find('div.oe_searchview_input:focus').text(); }, /** * Provide auto-completion result for req.term (an array to `resp`) From a40e410d1afdddd0f266af338a674fd1670fd74a Mon Sep 17 00:00:00 2001 From: Xavier Morel Date: Wed, 2 May 2012 15:27:43 +0200 Subject: [PATCH 25/81] [ADD] correct handling of input blurring bzr revid: xmo@openerp.com-20120502132743-dr29i2fvrpo6tute --- addons/web/static/src/js/search.js | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/addons/web/static/src/js/search.js b/addons/web/static/src/js/search.js index 93e1caec290..21cb4a71196 100644 --- a/addons/web/static/src/js/search.js +++ b/addons/web/static/src/js/search.js @@ -122,10 +122,17 @@ my.InputView = instance.web.Widget.extend({ start: function () { var self = this; var p = this._super.apply(this, arguments); - this.$element.on('focus', function () { - self.$element.siblings().trigger('deselect'); - }); + this.$element.on('focus', this.proxy('onFocus')); + this.$element.on('blur', this.proxy('onBlur')); return p; + }, + onFocus: function () { + this.$element.siblings().trigger('deselect'); + this.getParent().$element.trigger('focus'); + }, + onBlur: function () { + this.$element.text(''); + this.getParent().$element.trigger('blur'); } }); my.FacetView = instance.web.Widget.extend({ @@ -302,7 +309,7 @@ instance.web.SearchView = instance.web.Widget.extend(/** @lends instance.web.Sea }); - var completer = this.$element.autocomplete({ + this.$element.autocomplete({ source: this.proxy('complete_global_search'), select: this.proxy('select_completion'), focus: function (e) { e.preventDefault(); }, From f009c765984eb8b409dc42f7bb601acf14e6b577 Mon Sep 17 00:00:00 2001 From: Xavier Morel Date: Wed, 2 May 2012 15:43:12 +0200 Subject: [PATCH 26/81] [ADD] focus last input if the user clicks somewhere in the search view, outside of a search view control bzr revid: xmo@openerp.com-20120502134312-0tuspwcmtlw5el3o --- addons/web/static/src/css/base.css | 7 +++++++ addons/web/static/src/css/base.sass | 5 +++++ addons/web/static/src/js/search.js | 17 ++++++++++++++++- 3 files changed, 28 insertions(+), 1 deletion(-) diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css index 20b4cb92ff4..6788c532d9d 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -1046,6 +1046,7 @@ white-space: nowrap; } .openerp .oe_searchview { + cursor: text; position: relative; float: right; padding-right: 20px; @@ -1059,6 +1060,12 @@ -webkit-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.2) inset; -box-shadow: 0 1px 2px rgba(0, 0, 0, 0.2) inset; } +.openerp .oe_searchview.oe_focused { + border-color: #a6a6fe; + -moz-box-shadow: 0 1px 2px #a6a6fe inset; + -webkit-box-shadow: 0 1px 2px #a6a6fe inset; + -box-shadow: 0 1px 2px #a6a6fe inset; +} .openerp .oe_searchview .oe_searchview_clear { cursor: pointer; position: absolute; diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index eabcae107b7..0f420b1aea3 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -819,6 +819,7 @@ $colour4: #8a89ba // }}} // SearchView xmo {{{ .oe_searchview + cursor: text position: relative float: right padding-right: 20px @@ -828,6 +829,10 @@ $colour4: #8a89ba @include radius(1em) @include box-shadow(0 1px 2px rgba(0,0,0,0.2) inset) + &.oe_focused + border-color: $facets-border-selected + @include box-shadow(0 1px 2px $facets-border-selected inset) + .oe_searchview_clear cursor: pointer position: absolute diff --git a/addons/web/static/src/js/search.js b/addons/web/static/src/js/search.js index 21cb4a71196..72b05df1317 100644 --- a/addons/web/static/src/js/search.js +++ b/addons/web/static/src/js/search.js @@ -155,6 +155,7 @@ my.FacetView = instance.web.Widget.extend({ if ($(e.target).is('.oe_facet_remove')) { return; } + e.stopPropagation(); self.$element.siblings().trigger('deselect'); self.$element.addClass('oe_selected'); }); @@ -259,7 +260,8 @@ instance.web.SearchView = instance.web.Widget.extend(/** @lends instance.web.Sea }); } - this.$element.on('click', '.oe_searchview_unfold_drawer', function () { + this.$element.on('click', '.oe_searchview_unfold_drawer', function (e) { + e.stopImmediatePropagation(); self.$element.toggleClass('oe_searchview_open_drawer'); }); this.$element.on('click', '.oe_facet_remove', function (e) { @@ -271,6 +273,19 @@ instance.web.SearchView = instance.web.Widget.extend(/** @lends instance.web.Sea self.query.remove( self.query.at(index), {trigger_search: true}); }); + this.$element.on('click', function (e) { + // Focus last input if the view itself is clicked (but not one of + // its children, that would be weird) + if (e.target === self.$element[0]) { + self.$element.find('.oe_searchview_input:last').focus(); + } + }); + this.$element.on('focus', function () { + self.$element.addClass('oe_focused'); + }); + this.$element.on('blur', function () { + self.$element.removeClass('oe_focused'); + }); return $.when(p, this.ready); }, From dce41d8aeaf9e4449ca56d51fbe82b103b04643e Mon Sep 17 00:00:00 2001 From: Xavier Morel Date: Wed, 2 May 2012 17:08:08 +0200 Subject: [PATCH 27/81] [ADD] automatic selection of first completion item in the list bzr revid: xmo@openerp.com-20120502150808-jpqiq63574ds2c1g --- addons/web/static/src/js/search.js | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/addons/web/static/src/js/search.js b/addons/web/static/src/js/search.js index 72b05df1317..eea51b1861b 100644 --- a/addons/web/static/src/js/search.js +++ b/addons/web/static/src/js/search.js @@ -286,6 +286,15 @@ instance.web.SearchView = instance.web.Widget.extend(/** @lends instance.web.Sea this.$element.on('blur', function () { self.$element.removeClass('oe_focused'); }); + // when the completion list opens/refreshes, automatically select the + // first completion item so if the user just hits [RETURN] or [TAB] it + // automatically selects it + this.$element.on('autocompleteopen', function () { + var menu = self.$element.data('autocomplete').menu; + menu.activate( + $.Event({ type: "mouseenter" }), + menu.element.children().first()); + }); return $.when(p, this.ready); }, From f04eb6a29ded59f7bbc05f850a34f856dfe5e9c7 Mon Sep 17 00:00:00 2001 From: Xavier Morel Date: Wed, 2 May 2012 17:10:11 +0200 Subject: [PATCH 28/81] [IMP] comments for event bindings bzr revid: xmo@openerp.com-20120502151011-4j8t9wworl7frndh --- addons/web/static/src/js/search.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/web/static/src/js/search.js b/addons/web/static/src/js/search.js index eea51b1861b..3fe216e70ba 100644 --- a/addons/web/static/src/js/search.js +++ b/addons/web/static/src/js/search.js @@ -273,13 +273,13 @@ instance.web.SearchView = instance.web.Widget.extend(/** @lends instance.web.Sea self.query.remove( self.query.at(index), {trigger_search: true}); }); + // Focus last input if the view itself is clicked this.$element.on('click', function (e) { - // Focus last input if the view itself is clicked (but not one of - // its children, that would be weird) if (e.target === self.$element[0]) { self.$element.find('.oe_searchview_input:last').focus(); } }); + // focusing class on whole searchview, :focus is not transitive this.$element.on('focus', function () { self.$element.addClass('oe_focused'); }); From 23ef3f9b963de4d17f617f7a284c2fe0fb2af0d8 Mon Sep 17 00:00:00 2001 From: Xavier Morel Date: Wed, 2 May 2012 17:34:39 +0200 Subject: [PATCH 29/81] [ADD] correct focus of facets in input sequence, ability to remove facet via backspace/delete bzr revid: xmo@openerp.com-20120502153439-0374v3dqz5fbe1ju --- addons/web/static/src/css/base.css | 10 ++++++++-- addons/web/static/src/css/base.sass | 6 +++++- addons/web/static/src/js/search.js | 17 +++++++++++------ addons/web/static/src/xml/base.xml | 5 +++-- 4 files changed, 27 insertions(+), 11 deletions(-) diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css index 6788c532d9d..8ebac64ea6d 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -1115,6 +1115,11 @@ cursor: pointer; display: inline-block; margin: 1px 0; + padding: 0; + -moz-box-shadow: none; + -webkit-box-shadow: none; + -box-shadow: none; + text-align: left; border: 1px solid #afafb6; -moz-border-radius: 3px; -webkit-border-radius: 3px; @@ -1122,6 +1127,7 @@ background: #f0f0fa; height: 18px; line-height: 18px; + -webkit-font-smoothing: auto; } .openerp .oe_searchview .oe_searchview_facet span { display: inline-block; @@ -1146,13 +1152,13 @@ background: #8786b7; text-shadow: 0 1px 1px rgba(0, 0, 0, 0.4); } -.openerp .oe_searchview .oe_searchview_facet.oe_selected { +.openerp .oe_searchview .oe_searchview_facet:focus { border-color: #a6a6fe; -moz-box-shadow: 0 0 3px 1px #a6a6fe; -webkit-box-shadow: 0 0 3px 1px #a6a6fe; -box-shadow: 0 0 3px 1px #a6a6fe; } -.openerp .oe_searchview .oe_searchview_facet.oe_selected .oe_facet_category { +.openerp .oe_searchview .oe_searchview_facet:focus .oe_facet_category { margin-left: 0; } .openerp .oe_searchview.oe_searchview_open_drawer .oe_searchview_drawer { diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index 0f420b1aea3..0fd7b5658c9 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -878,11 +878,15 @@ $colour4: #8a89ba cursor: pointer display: inline-block margin: 1px 0 + padding: 0 + @include box-shadow(none) + text-align: left border: 1px solid $facets-border @include radius(3px) background: #f0f0fa height: 18px line-height: 18px + -webkit-font-smoothing: auto span display: inline-block @@ -906,7 +910,7 @@ $colour4: #8a89ba background: #8786b7 text-shadow: 0 1px 1px rgba(0, 0, 0, 0.4) - &.oe_selected + &:focus border-color: $facets-border-selected @include box-shadow(0 0 3px 1px $facets-border-selected) diff --git a/addons/web/static/src/js/search.js b/addons/web/static/src/js/search.js index 3fe216e70ba..eb2ad5bc84d 100644 --- a/addons/web/static/src/js/search.js +++ b/addons/web/static/src/js/search.js @@ -127,7 +127,6 @@ my.InputView = instance.web.Widget.extend({ return p; }, onFocus: function () { - this.$element.siblings().trigger('deselect'); this.getParent().$element.trigger('focus'); }, onBlur: function () { @@ -148,16 +147,22 @@ my.FacetView = instance.web.Widget.extend({ }, start: function () { var self = this; - this.$element.on('deselect', function () { - self.$element.removeClass('oe_selected'); - }); this.$element.on('click', function (e) { if ($(e.target).is('.oe_facet_remove')) { return; } + self.$element.focus(); e.stopPropagation(); - self.$element.siblings().trigger('deselect'); - self.$element.addClass('oe_selected'); + }); + this.$element.on('keydown', function (e) { + var keys = $.ui.keyCode; + switch (e.which) { + case keys.BACKSPACE: + case keys.DELETE: + self.getParent().query.remove( + self.model, {trigger_search: true}); + return false; + } }); var $e = self.$element.find('> span:last-child'); var q = $.when(this._super()); diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml index 43078730337..bec0c1c5fb0 100644 --- a/addons/web/static/src/xml/base.xml +++ b/addons/web/static/src/xml/base.xml @@ -1299,13 +1299,14 @@
-
✖ -
+ From 69af9da2c8f5800e07005ea7a8d5ed8b34089af0 Mon Sep 17 00:00:00 2001 From: Xavier Morel Date: Thu, 3 May 2012 10:07:23 +0200 Subject: [PATCH 30/81] [IMP] change minLength condition to 1 for completion 0 allows opening a completion list with nothing, but that turns out not to be very useful and it interacts weirdly with tabbing between search inputs bzr revid: xmo@openerp.com-20120503080723-i4u9vl91rhlfhmg8 --- addons/web/static/src/js/search.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/web/static/src/js/search.js b/addons/web/static/src/js/search.js index eb2ad5bc84d..6842571c5f7 100644 --- a/addons/web/static/src/js/search.js +++ b/addons/web/static/src/js/search.js @@ -343,7 +343,7 @@ instance.web.SearchView = instance.web.Widget.extend(/** @lends instance.web.Sea select: this.proxy('select_completion'), focus: function (e) { e.preventDefault(); }, html: true, - minLength: 0, + minLength: 1, delay: 0 }).data('autocomplete')._renderItem = function (ul, item) { // item of completion list From 836dfa6aa8b8abd62c16abb86ea04cdd0d76a932 Mon Sep 17 00:00:00 2001 From: Xavier Morel Date: Thu, 3 May 2012 13:56:08 +0200 Subject: [PATCH 31/81] [IMP] move responsibility for facet removal (on click) to the facet's view, use Model#destroy for facet removal instead of a convoluted route through SearchView#query bzr revid: xmo@openerp.com-20120503115608-7dwyj5j9mq82gv73 --- addons/web/static/src/js/search.js | 25 +++++-------------------- 1 file changed, 5 insertions(+), 20 deletions(-) diff --git a/addons/web/static/src/js/search.js b/addons/web/static/src/js/search.js index 6842571c5f7..2227aa52465 100644 --- a/addons/web/static/src/js/search.js +++ b/addons/web/static/src/js/search.js @@ -149,7 +149,8 @@ my.FacetView = instance.web.Widget.extend({ var self = this; this.$element.on('click', function (e) { if ($(e.target).is('.oe_facet_remove')) { - return; + self.model.destroy(); + return false; } self.$element.focus(); e.stopPropagation(); @@ -159,8 +160,7 @@ my.FacetView = instance.web.Widget.extend({ switch (e.which) { case keys.BACKSPACE: case keys.DELETE: - self.getParent().query.remove( - self.model, {trigger_search: true}); + self.model.destroy(); return false; } }); @@ -233,14 +233,8 @@ instance.web.SearchView = instance.web.Widget.extend(/** @lends instance.web.Sea this.setup_global_completion(); this.query = new my.SearchQuery() - .on('add change reset', this.proxy('do_search')) - .on('add change reset', this.proxy('renderFacets')) - .on('remove', function (record, collection, options) { - self.renderFacets(); - if (options.trigger_search) { - self.do_search(); - } - }); + .on('add change reset remove', this.proxy('do_search')) + .on('add change reset remove', this.proxy('renderFacets')); if (this.hidden) { this.$element.hide(); @@ -269,15 +263,6 @@ instance.web.SearchView = instance.web.Widget.extend(/** @lends instance.web.Sea e.stopImmediatePropagation(); self.$element.toggleClass('oe_searchview_open_drawer'); }); - this.$element.on('click', '.oe_facet_remove', function (e) { - e.stopImmediatePropagation(); - // get index of clicked facet: number of preceding facet siblings - var index = $(this).closest('.oe_searchview_facet') - .prevAll('.oe_searchview_facet') - .length; - self.query.remove( - self.query.at(index), {trigger_search: true}); - }); // Focus last input if the view itself is clicked this.$element.on('click', function (e) { if (e.target === self.$element[0]) { From 6d12c155a4fc36fc7d7906aaefcc9da8c0a6e48d Mon Sep 17 00:00:00 2001 From: Xavier Morel Date: Thu, 3 May 2012 14:59:49 +0200 Subject: [PATCH 32/81] [TEST] serialization of search domains & contexts by the search view bzr revid: xmo@openerp.com-20120503125949-2m8euott3xzyivdm --- addons/web/static/src/js/search.js | 21 ++- addons/web/static/test/search.js | 235 ++++++++++++++++++++--------- doc/search-view.rst | 26 +++- 3 files changed, 195 insertions(+), 87 deletions(-) diff --git a/addons/web/static/src/js/search.js b/addons/web/static/src/js/search.js index 2227aa52465..4417912b6d4 100644 --- a/addons/web/static/src/js/search.js +++ b/addons/web/static/src/js/search.js @@ -656,7 +656,6 @@ instance.web.SearchView = instance.web.Widget.extend(/** @lends instance.web.Sea do_search: function () { var domains = [], contexts = [], groupbys = [], errors = []; - return this.on_search([], [], []); this.query.each(function (facet) { var field = facet.get('field'); try { @@ -902,12 +901,12 @@ instance.web.search.FilterGroup = instance.web.search.Input.extend(/** @lends in /** * Fetches contexts for all enabled filters in the group * - * @param {VS.model.SearchFacet} facet + * @param {openerp.web.search.Facet} facet * @return {*} combined contexts of the enabled filters in this group */ get_context: function (facet) { - var contexts = _(facet.get('values')).chain() - .map(function (filter) { return filter.attrs.context; }) + var contexts = _(facet.values).chain() + .map(function (f) { return f.get('value').attrs.context; }) .reject(_.isEmpty) .value(); @@ -924,8 +923,8 @@ instance.web.search.FilterGroup = instance.web.search.Input.extend(/** @lends in * @return {Array} enabled filters in this group */ get_groupby: function (facet) { - return _(facet.get('values')).chain() - .map(function (filter) { return filter.attrs.context; }) + return _(facet.values).chain() + .map(function (f) { return f.get('value').attrs.context; }) .reject(_.isEmpty) .value(); }, @@ -936,8 +935,8 @@ instance.web.search.FilterGroup = instance.web.search.Input.extend(/** @lends in * @return {*} combined domains of the enabled filters in this group */ get_domain: function (facet) { - var domains = _(facet.get('values')).chain() - .map(function (filter) { return filter.attrs.domain; }) + var domains = _(facet.values).chain() + .map(function (f) { return f.get('value').attrs.domain; }) .reject(_.isEmpty) .value(); @@ -1014,14 +1013,14 @@ instance.web.search.Field = instance.web.search.Input.extend( /** @lends instanc return facet.value(); }, get_context: function (facet) { - var val = this.get_value(facet); // A field needs a value to be "active", and a context to send when // active - var has_value = (val !== null && val !== ''); var context = this.attrs.context; - if (!(has_value && context)) { + if (!context) { return; } + var val = this.get_value(facet); + var has_value = (val !== null && val !== ''); return new instance.web.CompoundContext(context) .set_eval_context({self: val}); }, diff --git a/addons/web/static/test/search.js b/addons/web/static/test/search.js index 1dcf03f90bd..17fdfc81749 100644 --- a/addons/web/static/test/search.js +++ b/addons/web/static/test/search.js @@ -4,6 +4,25 @@ $(document).ready(function () { xhr.send(null); var doc = xhr.responseXML; + var noop = function () {}; + /** + * Make connection RPC responses mockable by setting keys on the + * Connection#responses object (key is the URL, value is the function to + * call with the RPC request payload) + * + * @param {openerp.web.Connection} connection connection instance to mockify + * @param {Object} [responses] url:function mapping to seed the mock connection + */ + var mockifyRPC = function (connection, responses) { + connection.responses = responses || {}; + connection.rpc_function = function (url, payload) { + if (!(url.url in this.responses)) { + return $.Deferred().reject({}, 'failed', _.str.sprintf("Url %s not found in mock responses", url.url)).promise(); + } + return $.when(this.responses[url.url](payload)); + }; + }; + var instance; module('query', { setup: function () { @@ -157,16 +176,7 @@ $(document).ready(function () { instance.web.qweb.add_template(doc); - instance.connection.responses = {}; - instance.connection.rpc_function = function (url, payload) { - if (!(url.url in this.responses)) { - return $.Deferred().reject( - {}, 'failed', - _.str.sprintf("Url %s not found in mock responses", - url.url)).promise(); - } - return $.when(this.responses[url.url](payload)); - }; + mockifyRPC(instance.connection); } }); @@ -220,7 +230,11 @@ $(document).ready(function () { }; var dataset = {model: 'dummy.model', get_context: function () { return {}; }}; - return new instance.web.SearchView(null, dataset, false, defaults); + var view = new instance.web.SearchView(null, dataset, false, defaults); + view.on_invalid.add(function () { + ok(false, JSON.stringify([].slice(arguments))); + }); + return view; } asyncTest('calling', 2, function () { var defaults_called = false; @@ -401,16 +415,7 @@ $(document).ready(function () { instance.web.qweb.add_template(doc); - instance.connection.responses = {}; - instance.connection.rpc_function = function (url, payload) { - if (!(url.url in this.responses)) { - return $.Deferred().reject( - {}, 'failed', - _.str.sprintf("Url %s not found in mock responses", - url.url)).promise(); - } - return $.when(this.responses[url.url](payload)); - }; + mockifyRPC(instance.connection); } }); asyncTest('calling', 4, function () { @@ -449,7 +454,7 @@ $(document).ready(function () { var completion = { label: "Dummy", facet: { - field: {}, + field: {get_domain: noop, get_context: noop, get_groupby: noop}, category: 'Dummy', values: [{label: 'dummy', value: 42}] } @@ -471,7 +476,7 @@ $(document).ready(function () { }); }); asyncTest('facet selection: new value existing facet', 3, function () { - var field = {}; + var field = {get_domain: noop, get_context: noop, get_groupby: noop}; var completion = { label: "Dummy", facet: { @@ -656,6 +661,115 @@ $(document).ready(function () { }); }); + module('search-serialization', { + setup: function () { + instance = window.openerp.init([]); + window.openerp.web.corelib(instance); + window.openerp.web.coresetup(instance); + window.openerp.web.chrome(instance); + window.openerp.web.data(instance); + window.openerp.web.search(instance); + + instance.web.qweb.add_template(doc); + + mockifyRPC(instance.connection); + } + }); + asyncTest('No facet, no call', 6, function () { + var got_domain = false, got_context = false, got_groupby = false; + var $fix = $('#qunit-fixture'); + var view = makeSearchView({ + get_domain: function () { + got_domain = true; + return null; + }, + get_context: function () { + got_context = true; + return null; + }, + get_groupby: function () { + got_groupby = true; + return null; + } + }); + var ds, cs, gs; + view.on_search.add(function (d, c, g) { + ds = d, cs = c, gs = g; + }); + view.appendTo($fix) + .always(start) + .fail(function (error) { ok(false, error.message); }) + .done(function () { + view.do_search(); + ok(!got_domain, "no facet, should not have fetched domain"); + ok(_(ds).isEmpty(), "domains list should be empty"); + + ok(!got_context, "no facet, should not have fetched context"); + ok(_(cs).isEmpty(), "contexts list should be empty"); + + ok(!got_groupby, "no facet, should not have fetched groupby"); + ok(_(gs).isEmpty(), "groupby list should be empty"); + }) + }); + asyncTest('London, calling', 8, function () { + var got_domain = false, got_context = false, got_groupby = false; + var $fix = $('#qunit-fixture'); + var view = makeSearchView({ + get_domain: function (facet) { + equal(facet.get('category'), "dummy"); + deepEqual(facet.values.toJSON(), [{label: "42", value: 42}]); + got_domain = true; + return null; + }, + get_context: function () { + got_context = true; + return null; + }, + get_groupby: function () { + got_groupby = true; + return null; + } + }, {dummy: 42}); + var ds, cs, gs; + view.on_search.add(function (d, c, g) { + ds = d, cs = c, gs = g; + }); + view.appendTo($fix) + .always(start) + .fail(function (error) { ok(false, error.message); }) + .done(function () { + view.do_search(); + ok(got_domain, "should have fetched domain"); + ok(_(ds).isEmpty(), "domains list should be empty"); + + ok(got_context, "should have fetched context"); + ok(_(cs).isEmpty(), "contexts list should be empty"); + + ok(got_groupby, "should have fetched groupby"); + ok(_(gs).isEmpty(), "groupby list should be empty"); + }) + }); + asyncTest('Generate domains', 1, function () { + var $fix = $('#qunit-fixture'); + var view = makeSearchView({ + get_domain: function (facet) { + return facet.values.map(function (value) { + return ['win', '4', value.get('value')]; + }); + } + }, {dummy: 42}); + var ds; + view.on_search.add(function (d) { ds = d; }); + view.appendTo($fix) + .always(start) + .fail(function (error) { ok(false, error.message); }) + .done(function () { + view.do_search(); + deepEqual(ds, [[['win', '4', 42]]], + "search should yield an array of contexts"); + }); + }); + module('drawer', { setup: function () { instance = window.openerp.init([]); @@ -667,16 +781,7 @@ $(document).ready(function () { instance.web.qweb.add_template(doc); - instance.connection.responses = {}; - instance.connection.rpc_function = function (url, payload) { - if (!(url.url in this.responses)) { - return $.Deferred().reject( - {}, 'failed', - _.str.sprintf("Url %s not found in mock responses", - url.url)).promise(); - } - return $.when(this.responses[url.url](payload)); - }; + mockifyRPC(instance.connection); } }); asyncTest('is-drawn', 2, function () { @@ -704,43 +809,35 @@ $(document).ready(function () { instance.web.qweb.add_template(doc); - instance.connection.responses = {}; - instance.connection.rpc_function = function (url, payload) { - if (!(url.url in this.responses)) { - return $.Deferred().reject( - {}, 'failed', - _.str.sprintf("Url %s not found in mock responses", - url.url)).promise(); + mockifyRPC(instance.connection, { + '/web/searchview/load': function () { + // view with a single group of filters + return {result: {fields_view: { + type: 'search', + fields: {}, + arch: { + tag: 'search', + attrs: {}, + children: [{ + tag: 'filter', + attrs: { string: "Foo1", domain: [ ['foo', '=', '1'] ] }, + children: [] + }, { + tag: 'filter', + attrs: { + name: 'foo2', + string: "Foo2", + domain: [ ['foo', '=', '2'] ] }, + children: [] + }, { + tag: 'filter', + attrs: { string: "Foo3", domain: [ ['foo', '=', '3'] ] }, + children: [] + }] + } + }}}; } - return $.when(this.responses[url.url](payload)); - }; - instance.connection.responses['/web/searchview/load'] = function () { - // view with a single group of filters - return {result: {fields_view: { - type: 'search', - fields: {}, - arch: { - tag: 'search', - attrs: {}, - children: [{ - tag: 'filter', - attrs: { string: "Foo1", domain: [ ['foo', '=', '1'] ] }, - children: [] - }, { - tag: 'filter', - attrs: { - name: 'foo2', - string: "Foo2", - domain: [ ['foo', '=', '2'] ] }, - children: [] - }, { - tag: 'filter', - attrs: { string: "Foo3", domain: [ ['foo', '=', '3'] ] }, - children: [] - }] - } - }}}; - }; + }); } }); asyncTest('drawn', 3, function () { diff --git a/doc/search-view.rst b/doc/search-view.rst index a7fbb77f51b..3c13f6ae921 100644 --- a/doc/search-view.rst +++ b/doc/search-view.rst @@ -249,21 +249,33 @@ Converting from facet objects Ultimately, the point of the search view is to allow searching. In OpenERP this is done via :ref:`domains `. On the other hand, the OpenERP Web 7 search view's state is modelled -after a collection of :js:class:`~VS.model.SearchFacet`, and each +after a collection of :js:class:`~openerp.web.search.Facet`, and each field of a search view may have special requirements when it comes to the domains it produces [#]_. So there needs to be some way of mapping -:js:class:`~VS.model.SearchFacet` objects to OpenERP search data. +:js:class:`~openerp.web.search.Facet` objects to OpenERP search data. This is done via an input's :js:func:`~openerp.web.search.Input.get_domain` and :js:func:`~openerp.web.search.Input.get_context`. Each takes a -:js:class:`~VS.model.SearchFacet` and returns whatever it's supposed -to generate (a domain or a context, respectively). Either can return -``null`` if the current value does not map to a domain or context, and -can throw an :js:class:`~openerp.web.search.Invalid` exception if the -value is not valid at all for the field. +:js:class:`~openerp.web.search.Facet` and returns whatever it's +supposed to generate (a domain or a context, respectively). Either can +return ``null`` if the current value does not map to a domain or +context, and can throw an :js:class:`~openerp.web.search.Invalid` +exception if the value is not valid at all for the field. + +.. note:: + + The :js:class:`~openerp.web.search.Facet` object can have any + number of values (from 1 upwards) + +.. note:: + + There is a third conversion method, + :js:func:`~openerp.web.search.Input.get_groupby`, which returns an + ``Array`` of groupby domains rather than a single context. At this + point, it is only implemented on (and used by) filters. Converting to facet objects --------------------------- From 0c99ac1333caa85ba61de4a36cf8576e7747568c Mon Sep 17 00:00:00 2001 From: Xavier Morel Date: Thu, 3 May 2012 17:43:11 +0200 Subject: [PATCH 33/81] [FIX] domain and context generation from fields, also doc bzr revid: xmo@openerp.com-20120503154311-4pg762pcgt83416c --- addons/web/static/src/js/search.js | 74 ++++++++++++------- addons/web/static/test/search.js | 64 ++++++++++++++++ doc/search-view.rst | 114 ++++++++++++++++++++++++++--- 3 files changed, 213 insertions(+), 39 deletions(-) diff --git a/addons/web/static/src/js/search.js b/addons/web/static/src/js/search.js index 4417912b6d4..2a7de8d81d0 100644 --- a/addons/web/static/src/js/search.js +++ b/addons/web/static/src/js/search.js @@ -1009,20 +1009,26 @@ instance.web.search.Field = instance.web.search.Input.extend( /** @lends instanc values: [{label: String(value), value: value}] }); }, - get_value: function (facet) { - return facet.value(); + value_from: function (facetValue) { + return facetValue.get('value'); }, get_context: function (facet) { - // A field needs a value to be "active", and a context to send when - // active + var self = this; + // A field needs a context to send when active var context = this.attrs.context; - if (!context) { + if (!context || !facet.values.length) { return; } - var val = this.get_value(facet); - var has_value = (val !== null && val !== ''); - return new instance.web.CompoundContext(context) - .set_eval_context({self: val}); + var contexts = facet.values.map(function (facetValue) { + return new instance.web.CompoundContext(context) + .set_eval_context({self: self.value_from(facetValue)}); + }); + + if (contexts.length === 1) { return contexts[0]; } + + return _.extend(instance.web.CompoundContext, { + __contexts: contexts + }); }, get_groupby: function () { }, /** @@ -1037,23 +1043,37 @@ instance.web.search.Field = instance.web.search.Input.extend( /** @lends instanc * @returns {Array} domain to include in the resulting search */ make_domain: function (name, operator, facet) { - return [[name, operator, this.get_value(facet)]]; + return [[name, operator, this.value_from(facet)]]; }, get_domain: function (facet) { - var val = this.get_value(facet); - if (val === null || val === '') { - return; + if (!facet.values.length) { return; } + + var value_to_domain; + var self = this; + var domain = this.attrs['filter_domain']; + if (domain) { + value_to_domain = function (facetValue) { + return new instance.web.CompoundDomain(domain) + .set_eval_context({self: self.value_from(facetValue)}); + }; + } else { + value_to_domain = function (facetValue) { + return self.make_domain( + self.attrs.name, + self.attrs.operator || self.default_operator, + facetValue); + }; + } + var domains = facet.values.map(value_to_domain); + + if (domains.length === 1) { return domains[0]; } + for (var i = domains.length; --i;) { + domains.unshift(['|']); } - var domain = this.attrs['filter_domain']; - if (!domain) { - return this.make_domain( - this.attrs.name, - this.attrs.operator || this.default_operator, - facet); - } - return new instance.web.CompoundDomain(domain) - .set_eval_context({self: val}); + return _.extend(new instance.web.CompoundDomain, { + __domains: domains + }); } }); /** @@ -1085,7 +1105,7 @@ instance.web.search.CharField = instance.web.search.Field.extend( /** @lends ins } }); instance.web.search.NumberField = instance.web.search.Field.extend(/** @lends instance.web.search.NumberField# */{ - get_value: function () { + value_from: function () { if (!this.$element.val()) { return null; } @@ -1193,7 +1213,7 @@ instance.web.search.SelectionField = instance.web.search.Field.extend(/** @lends if (!match) { return $.when(null); } return $.when(facet_from(this, match)); }, - get_value: function (facet) { + value_from: function (facet) { return facet.get('values'); } }); @@ -1209,7 +1229,7 @@ instance.web.search.BooleanField = instance.web.search.SelectionField.extend(/** ['false', _t("No")] ]; }, - get_value: function (facet) { + value_from: function (facet) { switch (this._super(facet)) { case 'false': return false; case 'true': return true; @@ -1222,7 +1242,7 @@ instance.web.search.BooleanField = instance.web.search.SelectionField.extend(/** * @extends instance.web.search.DateField */ instance.web.search.DateField = instance.web.search.Field.extend(/** @lends instance.web.search.DateField# */{ - get_value: function (facet) { + value_from: function (facet) { return openerp.web.date_to_str(facet.get('values')); }, complete: function (needle) { @@ -1255,7 +1275,7 @@ instance.web.search.DateField = instance.web.search.Field.extend(/** @lends inst * @extends instance.web.DateField */ instance.web.search.DateTimeField = instance.web.search.DateField.extend(/** @lends instance.web.search.DateTimeField# */{ - get_value: function (facet) { + value_from: function (facet) { return openerp.web.datetime_to_str(facet.get('values')); } }); diff --git a/addons/web/static/test/search.js b/addons/web/static/test/search.js index 17fdfc81749..682cf27a7ab 100644 --- a/addons/web/static/test/search.js +++ b/addons/web/static/test/search.js @@ -770,6 +770,70 @@ $(document).ready(function () { }); }); + test('Field single value, default domain & context', function () { + var f = new instance.web.search.Field({}, {name: 'foo'}, {inputs: []}); + var facet = new instance.web.search.Facet({ + field: f, + values: [{value: 42}] + }); + + deepEqual(f.get_domain(facet), [['foo', '=', 42]], + "default field domain is a strict equality of name to facet's value"); + equal(f.get_context(facet), null, + "default field context is null"); + }); + test('Field multiple values, default domain & context', function () { + var f = new instance.web.search.Field({}, {name: 'foo'}, {inputs: []}); + var facet = new instance.web.search.Facet({ + field: f, + values: [{value: 42}, {value: 68}, {value: 999}] + }); + + var actual_domain = f.get_domain(facet); + equal(actual_domain.__ref, "compound_domain", + "multiple value should yield compound domain"); + deepEqual(actual_domain.__domains, [ + ['|'], + ['|'], + [['foo', '=', 42]], + [['foo', '=', 68]], + [['foo', '=', 999]] + ], + "domain should OR a default domain for each value"); + equal(f.get_context(facet), null, + "default field context is null"); + }); + test('Field single value, custom domain & context', function () { + var f = new instance.web.search.Field({attrs:{ + context: "{'bob': self}", + filter_domain: "[['edmund', 'is', self]]" + }}, {name: 'foo'}, {inputs: []}); + var facet = new instance.web.search.Facet({ + field: f, + values: [{value: "great"}] + }); + + var actual_domain = f.get_domain(facet); + equal(actual_domain.__ref, "compound_domain", + "@filter_domain should yield compound domain"); + deepEqual(actual_domain.__domains, [ + "[['edmund', 'is', self]]" + ], 'should hold unevaluated custom domain'); + deepEqual(actual_domain.get_eval_context(), { + self: "great" + }, "evaluation context should hold facet value as self"); + + var actual_context = f.get_context(facet); + equal(actual_context.__ref, "compound_context", + "@context should yield compound context"); + deepEqual(actual_context.__contexts, [ + "{'bob': self}" + ], 'should hold unevaluated custom context'); + deepEqual(actual_context.get_eval_context(), { + self: "great" + }, "evaluation context should hold facet value as self"); + }); + module('drawer', { setup: function () { instance = window.openerp.init([]); diff --git a/doc/search-view.rst b/doc/search-view.rst index 3c13f6ae921..f8dce473382 100644 --- a/doc/search-view.rst +++ b/doc/search-view.rst @@ -277,6 +277,92 @@ exception if the value is not valid at all for the field. ``Array`` of groupby domains rather than a single context. At this point, it is only implemented on (and used by) filters. +Field services +++++++++++++++ + +:js:class:`~openerp.web.search.Field` provides a default +implementation of :js:func:`~openerp.web.search.Input.get_domain` and +:js:func:`~openerp.web.search.Input.get_context` taking care of most +of the peculiarities pertaining to OpenERP's handling of fields in +search views. It also provides finer hooks to let developers of new +fields and widgets customize the behavior they want without +necessarily having to reimplement all of +:js:func:`~openerp.web.search.Input.get_domain` or +:js:func:`~openerp.web.search.Input.get_context`: + +.. js:function:: openerp.web.search.Field.get_context(facet) + + If the field has no ``@context``, simply returns + ``null``. Otherwise, calls + :js:func:`~openerp.web.search.Field.value_from` once for each + :js:class:`~openerp.web.search.FacetValue` of the current + :js:class:`~openerp.web.search.Facet` (in order to extract the + basic javascript object from the + :js:class:`~openerp.web.search.FacetValue` then evaluates + ``@context`` with each of these values set as ``self``, and + returns the union of all these contexts. + + :param facet: + :type facet: openerp.web.search.Facet + :returns: a context (literal or compound) + +.. js:function:: openerp.web.search.Field.get_domain(facet) + + If the field has no ``@filter_domain``, calls + :js:func:`~openerp.web.search.Field.make_domain` once with each + :js:class:`~openerp.web.search.FacetValue` of the current + :js:class:`~openerp.web.search.Facet` as well as the field's + ``@name`` and either its ``@operator`` or + :js:attr:`~openerp.web.search.Field.default_operator`. + + If the field has an ``@filter_value``, calls + :js:func:`~openerp.web.search.Field.value_from` once per + :js:class:`~openerp.web.search.FacetValue` and evaluates + ``@filter_value`` with each of these values set as ``self``. + + In either case, "ors" all of the resulting domains (using ``|``) + if there is more than one + :js:class:`~openerp.web.search.FacetValue` and returns the union + of the result. + + :param facet: + :type facet: openerp.web.search.Facet + :returns: a domain (literal or compound) + +.. js:function:: openerp.web.search.Field.make_domain(name, operator, facetValue) + + Builds a literal domain from the provided data. Calls + :js:func:`~openerp.web.search.Field.value_from` on the + :js:class:`~openerp.web.search.FacetValue` and evaluates and sets + it as the domain's third value, uses the other two parameters as + the first two values. + + Can be overridden to build more complex default domains. + + :param String name: the field's name + :param String operator: the operator to use in the field's domain + :param facetValue: + :type facetValue: openerp.web.search.FacetValue + :returns: Array<(String, String, Object)> + +.. js:function:: openerp.web.search.Field.value_from(facetValue) + + Extracts a "bare" javascript value from the provided + :js:class:`~openerp.web.search.FacetValue`, and returns it. + + The default implementation will simply return the ``value`` + backbone property of the argument. + + :param facetValue: + :type facetValue: openerp.web.search.FacetValue + :returns: Object + +.. js:attribute:: openerp.web.search.Field.default_operator + + Operator used to build a domain when a field has no ``@operator`` + or ``@filter_domain``. ``"="`` for + :js:class:`~openerp.web.search.Field` + Converting to facet objects --------------------------- @@ -314,7 +400,7 @@ Widgets API * :js:func:`~openerp.web.search.Input.get_domain` and :js:func:`~openerp.web.search.Input.get_context` now take a - :js:class:`~VS.model.SearchFacet` as parameter, from which it's + :js:class:`~openerp.web.search.Facet` as parameter, from which it's their job to get whatever value they want * :js:func:`~openerp.web.search.Input.get_groupby` has been added. It returns @@ -334,19 +420,16 @@ Filters Fields ++++++ -* ``get_value`` now takes a :js:class:`~VS.model.SearchFacet` (instead - of taking no argument). - - A default implementation is provided as - :js:func:`openerp.web.search.Field.get_value` and simply calls - :js:func:`VS.model.SearchFacet.value`. +* ``get_value`` has been replaced by + :js:func:`~openerp.web.search.Field.value_from` as it now takes a + :js:class:`~openerp.web.search.FacetValue` argument (instead of no + argument). It provides a default implementation returning the + ``value`` property of its argument. * The third argument to - :js:func:`~openerp.web.search.Field.make_domain` is now the - :js:class:`~VS.model.SearchFacet` received by - :js:func:`~openerp.web.search.Field.get_domain`, so child classes - have all the information they need to derive the "right" resulting - domain. + :js:func:`~openerp.web.search.Field.make_domain` is now a + :js:class:`~openerp.web.search.FacetValue` so child classes have all + the information they need to derive the "right" resulting domain. Custom filters ++++++++++++++ @@ -363,6 +446,13 @@ Many To One :js:func:`openerp.web.search.ManyToOneField.setup_autocomplete` has been removed. +Advanced Search ++++++++++++++++ + +The advanced search is now a more standard +:js:class:`~openerp.web.search.Input` configured to be rendered in the +drawer. + .. [#] the original view was implemented on top of a monkey-patched VisualSearch, but as our needs diverged from VisualSearch's goal this made less and less sense ultimately leading to a clean-room From aca54c981267df74e32fe981b1d0c62e84634fa6 Mon Sep 17 00:00:00 2001 From: Xavier Morel Date: Thu, 3 May 2012 17:47:51 +0200 Subject: [PATCH 34/81] [REM] pointless overrides to value_from and make_domain - selection does not need to override get_value/value_from - neither does boolean, its selection values can be correctly set from the start - m2o can only facet correct values, not fuzzy, so the make_domain override is not useful bzr revid: xmo@openerp.com-20120503154751-w5pojni831xwu6bv --- addons/web/static/src/js/search.js | 30 ++++++------------------------ 1 file changed, 6 insertions(+), 24 deletions(-) diff --git a/addons/web/static/src/js/search.js b/addons/web/static/src/js/search.js index 2a7de8d81d0..2c31b5435be 100644 --- a/addons/web/static/src/js/search.js +++ b/addons/web/static/src/js/search.js @@ -1212,9 +1212,6 @@ instance.web.search.SelectionField = instance.web.search.Field.extend(/** @lends }); if (!match) { return $.when(null); } return $.when(facet_from(this, match)); - }, - value_from: function (facet) { - return facet.get('values'); } }); instance.web.search.BooleanField = instance.web.search.SelectionField.extend(/** @lends instance.web.search.BooleanField# */{ @@ -1225,16 +1222,9 @@ instance.web.search.BooleanField = instance.web.search.SelectionField.extend(/** init: function () { this._super.apply(this, arguments); this.attrs.selection = [ - ['true', _t("Yes")], - ['false', _t("No")] + [true, _t("Yes")], + [false, _t("No")] ]; - }, - value_from: function (facet) { - switch (this._super(facet)) { - case 'false': return false; - case 'true': return true; - default: return null; - } } }); /** @@ -1242,8 +1232,8 @@ instance.web.search.BooleanField = instance.web.search.SelectionField.extend(/** * @extends instance.web.search.DateField */ instance.web.search.DateField = instance.web.search.Field.extend(/** @lends instance.web.search.DateField# */{ - value_from: function (facet) { - return openerp.web.date_to_str(facet.get('values')); + value_from: function (facetValue) { + return openerp.web.date_to_str(facetValue.get('value')); }, complete: function (needle) { var d = Date.parse(needle); @@ -1275,8 +1265,8 @@ instance.web.search.DateField = instance.web.search.Field.extend(/** @lends inst * @extends instance.web.DateField */ instance.web.search.DateTimeField = instance.web.search.DateField.extend(/** @lends instance.web.search.DateTimeField# */{ - value_from: function (facet) { - return openerp.web.datetime_to_str(facet.get('values')); + value_from: function (facetValue) { + return openerp.web.datetime_to_str(facetValue.get('value')); } }); instance.web.search.ManyToOneField = instance.web.search.CharField.extend({ @@ -1312,14 +1302,6 @@ instance.web.search.ManyToOneField = instance.web.search.CharField.extend({ if (_(names).isEmpty()) { return null; } return facet_from(self, names[0]); }) - }, - make_domain: function (name, operator, facet) { - // ``json`` -> actual auto-completed id - if (facet.get('values')) { - return [[name, '=', facet.get('values')]]; - } - - return this._super(name, operator, facet); } }); From 5c4ac52291e4ec599da32f44281c310e93f3b5d1 Mon Sep 17 00:00:00 2001 From: Xavier Morel Date: Thu, 3 May 2012 17:55:32 +0200 Subject: [PATCH 35/81] [FIX] typo: remember to instantiate objects bzr revid: xmo@openerp.com-20120503155532-q2es166215yfgn7g --- addons/web/static/src/js/search.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/web/static/src/js/search.js b/addons/web/static/src/js/search.js index 2c31b5435be..196fdcac0cd 100644 --- a/addons/web/static/src/js/search.js +++ b/addons/web/static/src/js/search.js @@ -1026,7 +1026,7 @@ instance.web.search.Field = instance.web.search.Input.extend( /** @lends instanc if (contexts.length === 1) { return contexts[0]; } - return _.extend(instance.web.CompoundContext, { + return _.extend(new instance.web.CompoundContext, { __contexts: contexts }); }, From 64538c181e2eff7ab5dde0c4b01fcc4b204bf52f Mon Sep 17 00:00:00 2001 From: Xavier Morel Date: Thu, 3 May 2012 18:37:09 +0200 Subject: [PATCH 36/81] [FIX] domain and context generation on m2o fields by default, an m2o field should behave like a charfield (== use its textual value), but if the domain is fully default (no filter_domain and no custom operator) and the user explicitly selected an object (which is the only thing he can do at this point in the new search view), then we can generate a domain matching exactly the stored id. bzr revid: xmo@openerp.com-20120503163709-odlnib513h3f84v6 --- addons/web/static/src/js/search.js | 10 +++++++ addons/web/static/test/search.js | 47 ++++++++++++++++++++++++++++++ 2 files changed, 57 insertions(+) diff --git a/addons/web/static/src/js/search.js b/addons/web/static/src/js/search.js index 196fdcac0cd..c0542585f40 100644 --- a/addons/web/static/src/js/search.js +++ b/addons/web/static/src/js/search.js @@ -1270,6 +1270,7 @@ instance.web.search.DateTimeField = instance.web.search.DateField.extend(/** @le } }); instance.web.search.ManyToOneField = instance.web.search.CharField.extend({ + default_operator: {}, init: function (view_section, field, view) { this._super(view_section, field, view); this.model = new instance.web.Model(this.attrs.relation); @@ -1302,6 +1303,15 @@ instance.web.search.ManyToOneField = instance.web.search.CharField.extend({ if (_(names).isEmpty()) { return null; } return facet_from(self, names[0]); }) + }, + value_from: function (facetValue) { + return facetValue.get('label'); + }, + make_domain: function (name, operator, facetValue) { + if (operator === this.default_operator) { + return [[name, '=', facetValue.get('value')]]; + } + return this._super(name, operator, facetValue); } }); diff --git a/addons/web/static/test/search.js b/addons/web/static/test/search.js index 682cf27a7ab..9b0205c462a 100644 --- a/addons/web/static/test/search.js +++ b/addons/web/static/test/search.js @@ -833,6 +833,53 @@ $(document).ready(function () { self: "great" }, "evaluation context should hold facet value as self"); }); + test("M2O default", function () { + var f = new instance.web.search.ManyToOneField( + {}, {name: 'foo'}, {inputs: []}); + var facet = new instance.web.search.Facet({ + field: f, + values: [{label: "Foo", value: 42}] + }); + + deepEqual(f.get_domain(facet), [['foo', '=', 42]], + "m2o should use identity if default domain"); + }); + test("M2O custom operator", function () { + var f = new instance.web.search.ManyToOneField( + {attrs: {operator: 'boos'}}, {name: 'foo'}, {inputs: []}); + var facet = new instance.web.search.Facet({ + field: f, + values: [{label: "Foo", value: 42}] + }); + + deepEqual(f.get_domain(facet), [['foo', 'boos', 'Foo']], + "m2o should use label with custom operators"); + }); + test("M2O custom domain & context", function () { + var f = new instance.web.search.ManyToOneField({attrs: { + context: "{'whee': self}", + filter_domain: "[['filter', 'is', self]]" + }}, {name: 'foo'}, {inputs: []}); + var facet = new instance.web.search.Facet({ + field: f, + values: [{label: "Foo", value: 42}] + }); + + var domain = f.get_domain(facet); + deepEqual(domain.__domains, [ + "[['filter', 'is', self]]" + ]); + deepEqual(domain.get_eval_context(), { + self: "Foo" + }, "custom domain's self should be label"); + var context = f.get_context(facet); + deepEqual(context.__contexts, [ + "{'whee': self}" + ]); + deepEqual(context.get_eval_context(), { + self: "Foo" + }, "custom context's self should be label"); + }); module('drawer', { setup: function () { From 94624b74b0ab62497682013c5b6083c98ce2bc42 Mon Sep 17 00:00:00 2001 From: Xavier Morel Date: Thu, 3 May 2012 21:26:45 +0200 Subject: [PATCH 37/81] [FIX] get_* methods on FilterGroup bzr revid: xmo@openerp.com-20120503192645-8x63l5rnwz2vg2yp --- addons/web/static/src/js/search.js | 6 ++--- addons/web/static/test/search.js | 36 ++++++++++++++++++++++++++++++ 2 files changed, 39 insertions(+), 3 deletions(-) diff --git a/addons/web/static/src/js/search.js b/addons/web/static/src/js/search.js index c0542585f40..780e096b34c 100644 --- a/addons/web/static/src/js/search.js +++ b/addons/web/static/src/js/search.js @@ -905,7 +905,7 @@ instance.web.search.FilterGroup = instance.web.search.Input.extend(/** @lends in * @return {*} combined contexts of the enabled filters in this group */ get_context: function (facet) { - var contexts = _(facet.values).chain() + var contexts = facet.values.chain() .map(function (f) { return f.get('value').attrs.context; }) .reject(_.isEmpty) .value(); @@ -923,7 +923,7 @@ instance.web.search.FilterGroup = instance.web.search.Input.extend(/** @lends in * @return {Array} enabled filters in this group */ get_groupby: function (facet) { - return _(facet.values).chain() + return facet.values.chain() .map(function (f) { return f.get('value').attrs.context; }) .reject(_.isEmpty) .value(); @@ -935,7 +935,7 @@ instance.web.search.FilterGroup = instance.web.search.Input.extend(/** @lends in * @return {*} combined domains of the enabled filters in this group */ get_domain: function (facet) { - var domains = _(facet.values).chain() + var domains = facet.values.chain() .map(function (f) { return f.get('value').attrs.domain; }) .reject(_.isEmpty) .value(); diff --git a/addons/web/static/test/search.js b/addons/web/static/test/search.js index 9b0205c462a..ca34750ad1c 100644 --- a/addons/web/static/test/search.js +++ b/addons/web/static/test/search.js @@ -881,6 +881,42 @@ $(document).ready(function () { }, "custom context's self should be label"); }); + asyncTest('FilterGroup', 6, function () { + var view = {inputs: []}; + var filter_a = new instance.web.search.Filter( + {attrs: {name: 'a', context: 'c1', domain: 'd1'}}, view); + var filter_b = new instance.web.search.Filter( + {attrs: {name: 'b', context: 'c2', domain: 'd2'}}, view); + var filter_c = new instance.web.search.Filter( + {attrs: {name: 'c', context: 'c3', domain: 'd3'}}, view); + var group = new instance.web.search.FilterGroup( + [filter_a, filter_b, filter_c], view); + group.facet_for_defaults({a: true, c: true}) + .always(start) + .fail(function (error) { ok(false, error && error.message); }) + .done(function (facet) { + var model = facet; + if (!(model instanceof instance.web.search.Facet)) { + model = new instance.web.search.Facet(facet); + } + + var domain = group.get_domain(model); + equal(domain.__ref, 'compound_domain', + "domain should be compound"); + deepEqual(domain.__domains, [ + ['|'], 'd1', 'd3' + ], "domain should OR filter domains"); + ok(!domain.get_eval_context(), "domain should have no evaluation context"); + var context = group.get_context(model); + equal(context.__ref, 'compound_context', + "context should be compound"); + deepEqual(context.__contexts, [ + 'c1', 'c3' + ], "context should merge all filter contexts"); + ok(!context.get_eval_context(), "context should have no evaluation context"); + }); + }); + module('drawer', { setup: function () { instance = window.openerp.init([]); From d4a9e10308a7ba8e14ec4364ea5bb73c8d22c9ce Mon Sep 17 00:00:00 2001 From: Xavier Morel Date: Thu, 3 May 2012 21:31:10 +0200 Subject: [PATCH 38/81] [ADD] handling of reset button on searchview bzr revid: xmo@openerp.com-20120503193110-aqmeo3dz94y49fg0 --- addons/web/static/src/js/search.js | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/addons/web/static/src/js/search.js b/addons/web/static/src/js/search.js index 780e096b34c..a17839f5c1c 100644 --- a/addons/web/static/src/js/search.js +++ b/addons/web/static/src/js/search.js @@ -259,6 +259,10 @@ instance.web.SearchView = instance.web.Widget.extend(/** @lends instance.web.Sea }); } + this.$element.on('click', '.oe_searchview_clear', function (e) { + e.stopImmediatePropagation(); + self.query.reset(); + }); this.$element.on('click', '.oe_searchview_unfold_drawer', function (e) { e.stopImmediatePropagation(); self.$element.toggleClass('oe_searchview_open_drawer'); From 2251227058da557f51b9a3199135ac45503801dd Mon Sep 17 00:00:00 2001 From: Xavier Morel Date: Thu, 3 May 2012 21:36:45 +0200 Subject: [PATCH 39/81] [FIX] Advanced view adaptations to new facet & value shapes bzr revid: xmo@openerp.com-20120503193645-ccap97ojw9cgre3y --- addons/web/static/src/js/search.js | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/addons/web/static/src/js/search.js b/addons/web/static/src/js/search.js index a17839f5c1c..39a53cf603f 100644 --- a/addons/web/static/src/js/search.js +++ b/addons/web/static/src/js/search.js @@ -1416,16 +1416,18 @@ instance.web.search.Advanced = instance.web.search.Input.extend({ var children = this.getChildren(), domain = _.invoke(children, 'get_proposition'); var filters = _(domain).map(function (section) { - return new instance.web.search.Filter({attrs: { - string: _.str.sprintf('%s(%s)%s', - section[0], section[1], section[2]), - domain: [section] - }}, self.view); + return { + label: _.str.sprintf('%s(%s)%s', + section[0], section[1], section[2]), + value: new instance.web.search.Filter({attrs: { + domain: [section] + }}, self.view) + }; }); // Create Filter (& FilterGroup around it) with that domain var f = new instance.web.search.FilterGroup(filters, this.view); // add group to query - this.query.add({ + this.view.query.add({ category: _t("Advanced"), values: filters, field: f From 7e0bd0103bda6ebd25ee0edfd239df889b79ccf7 Mon Sep 17 00:00:00 2001 From: Xavier Morel Date: Fri, 4 May 2012 11:43:06 +0200 Subject: [PATCH 40/81] [ADD] single-facet handling of groupby bzr revid: xmo@openerp.com-20120504094306-dieslsoibjjbtcs5 --- addons/web/static/src/js/search.js | 59 +++++++++++++++++++++++------- 1 file changed, 46 insertions(+), 13 deletions(-) diff --git a/addons/web/static/src/js/search.js b/addons/web/static/src/js/search.js index 39a53cf603f..a9d26bf747b 100644 --- a/addons/web/static/src/js/search.js +++ b/addons/web/static/src/js/search.js @@ -880,6 +880,13 @@ instance.web.search.FilterGroup = instance.web.search.Input.extend(/** @lends in * @param {instance.web.SearchView} view view in which the filters are contained */ init: function (filters, view) { + // If all filters are group_by and we're not initializing a GroupbyGroup, + // create a GroupbyGroup instead of the current FilterGroup + if (!(this instanceof instance.web.search.GroupbyGroup) && + _(filters).all(function (f) { + return f.attrs.context && f.attrs.context.group_by; })) { + return new instance.web.search.GroupbyGroup(filters, view); + } this._super(view); this.filters = filters; }, @@ -887,6 +894,13 @@ instance.web.search.FilterGroup = instance.web.search.Input.extend(/** @lends in this.$element.on('click', 'li', this.proxy('toggle_filter')); return $.when(null); }, + make_facet: function (values) { + return { + category: _t("Filter"), + values: values, + field: this + } + }, facet_for_defaults: function (defaults) { var fs = _(this.filters).chain() .filter(function (f) { @@ -896,11 +910,7 @@ instance.web.search.FilterGroup = instance.web.search.Input.extend(/** @lends in value: f}; }).value(); if (_.isEmpty(fs)) { return $.when(null); } - return $.when({ - category: _t("Filter"), - values: fs, - field: this - }); + return $.when(this.make_facet(fs)); }, /** * Fetches contexts for all enabled filters in the group @@ -957,14 +967,37 @@ instance.web.search.FilterGroup = instance.web.search.Input.extend(/** @lends in this.toggle(this.filters[$(e.target).index()]); }, toggle: function (filter) { - this.view.query.toggle({ - category: _t("Filter"), - field: this, - values: [{ - label: filter.attrs.string || filter.attrs.name, - value: filter - }] - }); + this.view.query.toggle(this.make_facet([{ + label: filter.attrs.string || filter.attrs.name, + value: filter + }])); + } +}); +instance.web.search.GroupbyGroup = instance.web.search.FilterGroup.extend({ + init: function (filters, view) { + this._super(filters, view); + // Not flanders: facet unicity is handled through the + // (category, field) pair of facet attributes. This is all well and + // good for regular filter groups where a group matche a facet, but for + // groupby we want a single facet. So cheat: add an attribute on the + // view which proxies to the first GroupbyGroup, so it can be used + // for every GroupbyGroup and still provides the various methods needed + // by the search view. Use weirdo name to avoid risks of conflicts + if (!this.getParent()._s_groupby) { + this.getParent()._s_groupby = { + help: "See GroupbyGroup#init", + get_context: this.proxy('get_context'), + get_domain: this.proxy('get_domain'), + get_groupby: this.proxy('get_groupby') + } + } + }, + make_facet: function (values) { + return { + category: _t("GroupBy"), + values: values, + field: this.getParent()._s_groupby + }; } }); instance.web.search.Filter = instance.web.search.Input.extend(/** @lends instance.web.search.Filter# */{ From 84cae313d28cdaa2b18325729831af75eea6d73c Mon Sep 17 00:00:00 2001 From: Xavier Morel Date: Fri, 4 May 2012 11:57:17 +0200 Subject: [PATCH 41/81] [ADD] icons instead of category names for filters (and groupby filters) bzr revid: xmo@openerp.com-20120504095717-va123l3gz3wvhjd1 --- addons/web/static/src/js/search.js | 4 ++++ addons/web/static/src/xml/base.xml | 6 +++++- doc/search-view.rst | 11 +++++++++++ 3 files changed, 20 insertions(+), 1 deletion(-) diff --git a/addons/web/static/src/js/search.js b/addons/web/static/src/js/search.js index a9d26bf747b..b9d46201149 100644 --- a/addons/web/static/src/js/search.js +++ b/addons/web/static/src/js/search.js @@ -869,6 +869,7 @@ instance.web.search.Input = instance.web.search.Widget.extend( /** @lends instan }); instance.web.search.FilterGroup = instance.web.search.Input.extend(/** @lends instance.web.search.FilterGroup# */{ template: 'SearchView.filters', + icon: 'q', /** * Inclusive group of filters, creates a continuous "button" with clickable * sections (the normal display for filters is to be a self-contained button) @@ -897,6 +898,7 @@ instance.web.search.FilterGroup = instance.web.search.Input.extend(/** @lends in make_facet: function (values) { return { category: _t("Filter"), + icon: this.icon, values: values, field: this } @@ -974,6 +976,7 @@ instance.web.search.FilterGroup = instance.web.search.Input.extend(/** @lends in } }); instance.web.search.GroupbyGroup = instance.web.search.FilterGroup.extend({ + icon: 'w', init: function (filters, view) { this._super(filters, view); // Not flanders: facet unicity is handled through the @@ -995,6 +998,7 @@ instance.web.search.GroupbyGroup = instance.web.search.FilterGroup.extend({ make_facet: function (values) { return { category: _t("GroupBy"), + icon: this.icon, values: values, field: this.getParent()._s_groupby }; diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml index bec0c1c5fb0..4b208a31b8f 100644 --- a/addons/web/static/src/xml/base.xml +++ b/addons/web/static/src/xml/base.xml @@ -1303,7 +1303,11 @@ type="button" class="oe_searchview_facet"> ✖ - + + + + diff --git a/doc/search-view.rst b/doc/search-view.rst index f8dce473382..2acaea3c8ad 100644 --- a/doc/search-view.rst +++ b/doc/search-view.rst @@ -218,6 +218,17 @@ with directly by external objects or search view controls it serializes to and deserializes from javascript arrays (via ``Collection#toJSON`` and ``Collection#reset``). + .. js:attribute:: [icon] + + optional, a single ASCII letter (a-z or A-Z) mapping to the + bundled mnmliconsRegular icon font. + + When a facet with an ``icon`` attribute is rendered, the icon + is displayed (in the icon font) in the first section of the + facet instead of the ``category``. + + By default, only filters make use of this facility. + .. js:class:: openerp.web.search.FacetValues `Backbone collection`_ of From 6b2efcbeb9ba386f1b9ef8a7395eb0c6b99ff39d Mon Sep 17 00:00:00 2001 From: Xavier Morel Date: Tue, 8 May 2012 18:21:37 +0200 Subject: [PATCH 42/81] [ADD] new implementation of saving current search to new filter bzr revid: xmo@openerp.com-20120508162137-b3qu0os79zl5wz0w --- addons/web/controllers/main.py | 19 ---- addons/web/static/src/css/base.css | 22 ++++ addons/web/static/src/css/base.sass | 18 +++ addons/web/static/src/js/search.js | 165 +++++++++++++++++----------- addons/web/static/src/xml/base.xml | 8 ++ 5 files changed, 148 insertions(+), 84 deletions(-) diff --git a/addons/web/controllers/main.py b/addons/web/controllers/main.py index 9b4c8335e35..72ed638879a 100644 --- a/addons/web/controllers/main.py +++ b/addons/web/controllers/main.py @@ -1287,25 +1287,6 @@ class SearchView(View): del filter['domain'] return filters - @openerpweb.jsonrequest - def save_filter(self, req, model, name, context_to_save, domain): - Model = req.session.model("ir.filters") - ctx = common.nonliterals.CompoundContext(context_to_save) - ctx.session = req.session - ctx = ctx.evaluate() - domain = common.nonliterals.CompoundDomain(domain) - domain.session = req.session - domain = domain.evaluate() - uid = req.session._uid - context = req.session.eval_context(req.context) - to_return = Model.create_or_replace({"context": ctx, - "domain": domain, - "model_id": model, - "name": name, - "user_id": uid - }, context) - return to_return - @openerpweb.jsonrequest def add_to_dashboard(self, req, menu_id, action_id, context_to_save, domain, view_mode, name=''): ctx = common.nonliterals.CompoundContext(context_to_save) diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css index 8ebac64ea6d..466e51e7a90 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -1175,6 +1175,17 @@ border: 1px solid #cccccc; text-align: left; } +.openerp .oe_searchview .oe_searchview_drawer button, .openerp .oe_searchview .oe_searchview_drawer .button { + border: none; + background: white; + padding: 0 2px; + -moz-box-shadow: none; + -webkit-box-shadow: none; + -box-shadow: none; + -moz-border-radius: 0; + -webkit-border-radius: 0; + border-radius: 0; +} .openerp .oe_searchview .oe_searchview_drawer .oe_searchview_filters { display: table; width: 100%; @@ -1205,6 +1216,17 @@ .openerp .oe_searchview .oe_searchview_drawer .oe_searchview_filters li:hover { background-color: #f0f0fa; } +.openerp .oe_searchview .oe_searchview_drawer .oe_searchview_custom .oe_searchview_custom_save { + font-size: 1px; + letter-spacing: -1px; + color: transparent; +} +.openerp .oe_searchview .oe_searchview_drawer .oe_searchview_custom .oe_searchview_custom_save:before { + font-family: "mnmliconsRegular"; + content: "S"; + font-size: 20px; + color: #404040; +} .openerp .oe_searchview .oe_searchview_drawer .oe_searchview_advanced h4 { border-top: 1px solid #cccccc; margin: 5px 0 3px; diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index 0fd7b5658c9..55d56056619 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -932,6 +932,13 @@ $colour4: #8a89ba border: 1px solid #ccc text-align: left + button, .button + border: none + background: white + padding: 0 2px + @include box-shadow(none) + @include radius(0) + .oe_searchview_filters display: table width: 100% @@ -960,6 +967,17 @@ $colour4: #8a89ba &:hover background-color: #f0f0fa + .oe_searchview_custom + .oe_searchview_custom_save + font-size: 1px + letter-spacing: -1px + color: transparent + &:before + font-family: "mnmliconsRegular" + content: "S" + font-size: 20px + color: #404040 + .oe_searchview_advanced h4 border-top: 1px solid #ccc diff --git a/addons/web/static/src/js/search.js b/addons/web/static/src/js/search.js index b9d46201149..1b61fe00b8d 100644 --- a/addons/web/static/src/js/search.js +++ b/addons/web/static/src/js/search.js @@ -221,8 +221,6 @@ instance.web.SearchView = instance.web.Widget.extend(/** @lends instance.web.Sea this.hidden = !!hidden; this.headless = this.hidden && !this.has_defaults; - this.filter_data = {}; - this.input_subviews = []; this.ready = $.Deferred(); @@ -246,13 +244,8 @@ instance.web.SearchView = instance.web.Widget.extend(/** @lends instance.web.Sea model: this.model, view_id: this.view_id, context: this.dataset.get_context() }); - // FIXME: local eval of domain and context to get rid of special endpoint - var filters = this.rpc('/web/searchview/get_filters', { - model: this.model - }).then(function (filters) { self.custom_filters = filters; }); - $.when(load_view, filters) - .pipe(function (load) { return load[0]; }) + $.when(load_view) .pipe(this.on_loaded) .fail(function () { self.ready.reject.apply(null, arguments); @@ -535,42 +528,6 @@ instance.web.SearchView = instance.web.Widget.extend(/** @lends instance.web.Sea limit : 80 }); break; - case 'save_filter': - var data = this.build_search_data(); - var context = new instance.web.CompoundContext(); - _.each(data.contexts, function(x) { - context.add(x); - }); - var domain = new instance.web.CompoundDomain(); - _.each(data.domains, function(x) { - domain.add(x); - }); - var groupbys = _.pluck(data.groupbys, "group_by").join(); - context.add({"group_by": groupbys}); - var dial_html = QWeb.render("SearchView.managed-filters.add"); - var $dial = $(dial_html); - instance.web.dialog($dial, { - modal: true, - title: _t("Filter Entry"), - buttons: [ - {text: _t("Cancel"), click: function() { - $(this).dialog("close"); - }}, - {text: _t("OK"), click: function() { - $(this).dialog("close"); - var name = $(this).find("input").val(); - self.rpc('/web/searchview/save_filter', { - model: self.dataset.model, - context_to_save: context, - domain: domain, - name: name - }).then(function() { - self.reload_managed_filters(); - }); - }} - ] - }); - break; case '': this.do_clear(); } @@ -647,17 +604,23 @@ instance.web.SearchView = instance.web.Widget.extend(/** @lends instance.web.Sea }); }, /** - * Performs the search view collection of widget data. + * Extract search data from the view's facets. * - * If the collection went well (all fields are valid), then triggers - * :js:func:`instance.web.SearchView.on_search`. + * Result is an object with 4 (own) properties: * - * If at least one field failed its validation, triggers - * :js:func:`instance.web.SearchView.on_invalid` instead. + * errors + * An array of any error generated during data validation and + * extraction, contains the validation error objects + * domains + * Array of domains + * contexts + * Array of contexts + * groupbys + * Array of domains, in groupby order rather than view order * - * @param e jQuery event object coming from the "Search" button + * @return {Object} */ - do_search: function () { + build_search_data: function () { var domains = [], contexts = [], groupbys = [], errors = []; this.query.each(function (facet) { @@ -683,12 +646,30 @@ instance.web.SearchView = instance.web.Widget.extend(/** @lends instance.web.Sea } } }); - - if (!_.isEmpty(errors)) { - this.on_invalid(errors); + return { + domains: domains, + contexts: contexts, + groupbys: groupbys, + errors: errors + }; + }, /** + * Performs the search view collection of widget data. + * + * If the collection went well (all fields are valid), then triggers + * :js:func:`instance.web.SearchView.on_search`. + * + * If at least one field failed its validation, triggers + * :js:func:`instance.web.SearchView.on_invalid` instead. + * + * @param e jQuery event object coming from the "Search" button + */ + do_search: function () { + var search = this.build_search_data(); + if (!_.isEmpty(search.errors)) { + this.on_invalid(search.errors); return; } - return this.on_search(domains, contexts, groupbys); + return this.on_search(search.domains, search.contexts, search.groupbys); }, /** * Triggered after the SearchView has collected all relevant domains and @@ -1356,6 +1337,68 @@ instance.web.search.ManyToOneField = instance.web.search.CharField.extend({ } }); +instance.web.search.CustomFilters = instance.web.search.Input.extend({ + template: 'SearchView.CustomFilters', + start: function () { + this.$element.on('submit', 'form', this.proxy('save_current')); + // FIXME: local eval of domain and context to get rid of special endpoint + return this.rpc('/web/searchview/get_filters', { + model: this.view.model + }).pipe(this.proxy('set_filters')); + }, + set_filters: function (filters) { + var self = this; + var content = this.$element.find('.oe_searchview_custom_list'); + return $.when.apply(null, _(filters).chain() + .map(function (filter) { + // FIXME: handling of ``disabled`` being set + var f = new instance.web.search.Filter({attrs: { + string: filter.name, + context: filter.context, + domain: filter.domain + }}, self.view); + return new instance.web.search.FilterGroup([f], self.view); + }) + .invoke('appendTo', content) + .value()); + }, + save_current: function () { + var self = this; + var $name = this.$element.find('input'); + + var search = this.view.build_search_data(); + this.rpc('/web/session/eval_domain_and_context', { + domains: search.domains, + contexts: search.contexts, + group_by_seq: search.groupbys || [] + }).pipe(function (results) { + if (!_.isEmpty(results.group_by)) { + results.context.group_by = results.group_by; + } + var name = $name.val(); + // FIXME: creates filter and group even if the call fails :/ + var f = new instance.web.search.Filter({attrs: { + string: name, + context: results.context, + domain: results.domain + }}, self.view); + (new instance.web.search.FilterGroup([f], self.view)) + .appendTo(self.$element.find('.oe_searchview_custom_list')); + // FIXME: current context? + return new instance.web.Model('ir.filters').call('create_or_replace', [{ + name: name, + user_id: instance.connection.uid, + model_id: self.view.model, + context: results.context, + domain: results.domain + }]); + }).then(function () { + $name.val(''); + }); + return false; + } +}); + instance.web.search.Filters = instance.web.search.Input.extend({ template: 'SearchView.Filters', _in_drawer: true, @@ -1395,16 +1438,8 @@ instance.web.search.Filters = instance.web.search.Input.extend({ // the db, add all of this as a group in the smallest column (col1.length <= col2.length ? col1 : col2).push({ name: _t("Custom Filters"), - filters: _.map(this.view.custom_filters, function (filter) { - // FIXME: handling of ``disabled`` being set - var f = new instance.web.search.Filter({attrs: { - string: filter.name, - context: filter.context, - domain: filter.domain - }}, self.view); - return new instance.web.search.FilterGroup([f], self.view); - }), - length: this.view.custom_filters.length + filters: [new instance.web.search.CustomFilters(self.view)], + length: 1 }); return $.when( this.render_column(col1, $('
').appendTo(this.$element)), diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml index 4b208a31b8f..f2df82b1b58 100644 --- a/addons/web/static/src/xml/base.xml +++ b/addons/web/static/src/xml/base.xml @@ -1469,6 +1469,14 @@
+
+
+
+ + + + +

Advanced Search...

From cd4c6fdd287d80c7358f5c06af2763b44d1a5135 Mon Sep 17 00:00:00 2001 From: Xavier Morel Date: Wed, 9 May 2012 15:32:41 +0200 Subject: [PATCH 43/81] [ADD] core keyboard navigation between facets bzr revid: xmo@openerp.com-20120509133241-42nl3comllgerxui --- addons/web/static/src/js/search.js | 102 +++++++++++++++++++++++++++++ 1 file changed, 102 insertions(+) diff --git a/addons/web/static/src/js/search.js b/addons/web/static/src/js/search.js index 1b61fe00b8d..b5e5f8f3f1f 100644 --- a/addons/web/static/src/js/search.js +++ b/addons/web/static/src/js/search.js @@ -117,6 +117,11 @@ my.SearchQuery = B.Collection.extend({ } }); +function assert(condition, message) { + if(!condition) { + throw new Error(message); + } +} my.InputView = instance.web.Widget.extend({ template: 'SearchView.InputView', start: function () { @@ -124,6 +129,7 @@ my.InputView = instance.web.Widget.extend({ var p = this._super.apply(this, arguments); this.$element.on('focus', this.proxy('onFocus')); this.$element.on('blur', this.proxy('onBlur')); + this.$element.on('keydown', this.proxy('onKeydown')); return p; }, onFocus: function () { @@ -132,6 +138,65 @@ my.InputView = instance.web.Widget.extend({ onBlur: function () { this.$element.text(''); this.getParent().$element.trigger('blur'); + }, + getSelection: function () { + // get Text node + var root = this.$element[0].childNodes[0]; + if (!root || !root.textContent) { + // if input does not have a child node, or the child node is an + // empty string, then the selection can only be (0, 0) + return {start: 0, end: 0}; + } + if (window.getSelection) { + var domRange = window.getSelection().getRangeAt(0); + assert(domRange.startContainer === root, + "selection should be in the input view"); + assert(domRange.endContainer === root, + "selection should be in the input view"); + return { + start: domRange.startOffset, + end: domRange.endOffset + } + } else if (document.selection) { + var ieRange = document.selection.createRange(); + var rangeParent = ieRange.parentElement(); + assert(rangeParent === root, + "selection should be in the input view"); + var offsetRange = document.body.createTextRange(); + offsetRange = offsetRange.moveToElementText(rangeParent); + offsetRange.setEndPoint("EndToStart", ieRange); + var start = offsetRange.text.length; + return { + start: start, + end: start + ieRange.text.length + } + } + throw new Error("Could not get caret position"); + }, + onKeydown: function (e) { + var sel; + switch (e.which) { + // Do not insert newline, but let it bubble so searchview can use it + case $.ui.keyCode.ENTER: + e.preventDefault(); + break; + + // let left/right events propagate to view if caret is at input border + // and not a selection + case $.ui.keyCode.LEFT: + sel = this.getSelection(); + if (sel.start !== 0 || sel.start !== sel.end) { + e.stopPropagation(); + } + break; + case $.ui.keyCode.RIGHT: + sel = this.getSelection(); + var len = this.$element.text().length; + if (sel.start !== len || sel.start !== sel.end) { + e.stopPropagation(); + } + break; + } } }); my.FacetView = instance.web.Widget.extend({ @@ -252,6 +317,20 @@ instance.web.SearchView = instance.web.Widget.extend(/** @lends instance.web.Sea }); } + this.$element.on('keydown', + '.oe_searchview_input, .oe_searchview_facet', function (e) { + switch(e.which) { + case $.ui.keyCode.LEFT: + self.focusPreceding(this); + e.preventDefault(); + break; + case $.ui.keyCode.RIGHT: + self.focusFollowing(this); + e.preventDefault(); + break; + } + }); + this.$element.on('click', '.oe_searchview_clear', function (e) { e.stopImmediatePropagation(); self.query.reset(); @@ -292,6 +371,29 @@ instance.web.SearchView = instance.web.Widget.extend(/** @lends instance.web.Sea this.$element.hide(); }, + subviewForRoot: function (subview_root) { + return _(this.input_subviews).detect(function (subview) { + return subview.$element[0] === subview_root; + }); + }, + focusRelative: function (subview, direction) { + var index = _(this.input_subviews).indexOf(subview) + direction; + if (index < 0) { + index = this.input_subviews.length - 1; + } else if (index >= this.input_subviews.length) { + index = 0; + } + this.input_subviews[index].$element.focus(); + }, + focusPreceding: function (subview_root) { + return this.focusRelative( + this.subviewForRoot(subview_root), -1); + }, + focusFollowing: function (subview_root) { + return this.focusRelative( + this.subviewForRoot(subview_root), +1); + }, + /** * Sets up thingie where all the mess is put? */ From 538b16c2350b75eccdefc249de6c58d851571c42 Mon Sep 17 00:00:00 2001 From: Xavier Morel Date: Wed, 9 May 2012 16:12:42 +0200 Subject: [PATCH 44/81] [ADD] backspace from within an empty input should remove the preceding facet, if any bzr revid: xmo@openerp.com-20120509141242-5l75w08ruv4r8xtc --- addons/web/static/src/js/search.js | 31 +++++++++++++++++++++--------- 1 file changed, 22 insertions(+), 9 deletions(-) diff --git a/addons/web/static/src/js/search.js b/addons/web/static/src/js/search.js index b5e5f8f3f1f..198740f4a97 100644 --- a/addons/web/static/src/js/search.js +++ b/addons/web/static/src/js/search.js @@ -125,7 +125,6 @@ function assert(condition, message) { my.InputView = instance.web.Widget.extend({ template: 'SearchView.InputView', start: function () { - var self = this; var p = this._super.apply(this, arguments); this.$element.on('focus', this.proxy('onFocus')); this.$element.on('blur', this.proxy('onBlur')); @@ -181,6 +180,18 @@ my.InputView = instance.web.Widget.extend({ e.preventDefault(); break; + // FIXME: may forget content if non-empty but caret at index 0, ok? + case $.ui.keyCode.BACKSPACE: + sel = this.getSelection(); + if (sel.start === 0 && sel.start === sel.end) { + e.preventDefault(); + var preceding = this.getParent().siblingSubview(this, -1); + if (preceding && (preceding instanceof my.FacetView)) { + preceding.model.destroy(); + } + } + break; + // let left/right events propagate to view if caret is at input border // and not a selection case $.ui.keyCode.LEFT: @@ -376,22 +387,24 @@ instance.web.SearchView = instance.web.Widget.extend(/** @lends instance.web.Sea return subview.$element[0] === subview_root; }); }, - focusRelative: function (subview, direction) { + siblingSubview: function (subview, direction, wrap_around) { var index = _(this.input_subviews).indexOf(subview) + direction; - if (index < 0) { + if (wrap_around && index < 0) { index = this.input_subviews.length - 1; - } else if (index >= this.input_subviews.length) { + } else if (wrap_around && index >= this.input_subviews.length) { index = 0; } - this.input_subviews[index].$element.focus(); + return this.input_subviews[index]; }, focusPreceding: function (subview_root) { - return this.focusRelative( - this.subviewForRoot(subview_root), -1); + return this.siblingSubview( + this.subviewForRoot(subview_root), -1, true) + .$element.focus(); }, focusFollowing: function (subview_root) { - return this.focusRelative( - this.subviewForRoot(subview_root), +1); + return this.siblingSubview( + this.subviewForRoot(subview_root), +1, true) + .$element.focus(); }, /** From 0d51f8992c4fad5cd46a0879b22dc2a697eb0769 Mon Sep 17 00:00:00 2001 From: Xavier Morel Date: Wed, 9 May 2012 17:12:17 +0200 Subject: [PATCH 45/81] [IMP] Insert completed facet in stead of the index used for the completion, instead of always adding them to the end (if applicable) bzr revid: xmo@openerp.com-20120509151217-4juo2hm8xxj21uj9 --- addons/web/static/src/js/search.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/addons/web/static/src/js/search.js b/addons/web/static/src/js/search.js index 198740f4a97..7c35a79ef84 100644 --- a/addons/web/static/src/js/search.js +++ b/addons/web/static/src/js/search.js @@ -500,7 +500,10 @@ instance.web.SearchView = instance.web.Widget.extend(/** @lends instance.web.Sea select_completion: function (e, ui) { e.preventDefault(); - this.query.add(ui.item.facet); + var input_index = _(this.input_subviews).indexOf( + this.subviewForRoot( + this.$element.find('div.oe_searchview_input:focus')[0])); + this.query.add(ui.item.facet, {at: input_index / 2}); }, renderFacets: function () { var self = this; From 06aa99eb19db9f2c7b19dd5d6f590b67ea574984 Mon Sep 17 00:00:00 2001 From: Xavier Morel Date: Thu, 10 May 2012 14:42:44 +0200 Subject: [PATCH 46/81] [IMP] correctly re-focus search view after rendering it bzr revid: xmo@openerp.com-20120510124244-y1t9wy0zitfxlfv3 --- addons/web/static/src/js/search.js | 30 ++++++++++++++++++++++++++---- 1 file changed, 26 insertions(+), 4 deletions(-) diff --git a/addons/web/static/src/js/search.js b/addons/web/static/src/js/search.js index 7c35a79ef84..2e4abda7b2a 100644 --- a/addons/web/static/src/js/search.js +++ b/addons/web/static/src/js/search.js @@ -505,24 +505,46 @@ instance.web.SearchView = instance.web.Widget.extend(/** @lends instance.web.Sea this.$element.find('div.oe_searchview_input:focus')[0])); this.query.add(ui.item.facet, {at: input_index / 2}); }, - renderFacets: function () { + /** + * + * @param {openerp.web.search.SearchQuery | openerp.web.search.Facet} _1 + * @param {openerp.web.search.Facet} [_2] + * @param {Object} [options] + */ + renderFacets: function (_1, _2, options) { + // _1: model if event=change, otherwise collection + // _2: undefined if event=change, otherwise model var self = this; + var started = []; var $e = this.$element.find('div.oe_searchview_facets'); _.invoke(this.input_subviews, 'destroy'); this.input_subviews = []; var i = new my.InputView(this); - i.appendTo($e); + started.push(i.appendTo($e)); this.input_subviews.push(i); this.query.each(function (facet) { var f = new my.FacetView(this, facet); - f.appendTo($e); + started.push(f.appendTo($e)); self.input_subviews.push(f); var i = new my.InputView(this); - i.appendTo($e); + started.push(i.appendTo($e)); self.input_subviews.push(i); }, this); + + $.when.apply(null, started).then(function () { + var input_to_focus; + // options.at: facet inserted at given index, focus next input + // otherwise just focus last input + if (!options || typeof options.at !== 'number') { + input_to_focus = _.last(self.input_subviews); + } else { + input_to_focus = self.input_subviews[(options.at + 1) * 2]; + } + + input_to_focus.$element.focus(); + }); }, /** From 978eae621d54b8c8bf1bc0afdf2d754d40bc2c42 Mon Sep 17 00:00:00 2001 From: Xavier Morel Date: Thu, 10 May 2012 20:52:14 +0200 Subject: [PATCH 47/81] [CHG] split custom filters handling out of regular filters bzr revid: xmo@openerp.com-20120510185214-qyh7wybl0un036dt --- addons/web/static/src/css/base.css | 11 +++- addons/web/static/src/css/base.sass | 10 ++- addons/web/static/src/js/search.js | 94 +++++++++++++++++------------ addons/web/static/src/xml/base.xml | 2 +- 4 files changed, 73 insertions(+), 44 deletions(-) diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css index 466e51e7a90..6d2287aa1c0 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -1175,6 +1175,14 @@ border: 1px solid #cccccc; text-align: left; } +.openerp .oe_searchview .oe_searchview_drawer > div { + border-top: 1px solid #cccccc; + margin: 3px 0; +} +.openerp .oe_searchview .oe_searchview_drawer > div:first-child { + border-top: none; + margin: 0; +} .openerp .oe_searchview .oe_searchview_drawer button, .openerp .oe_searchview .oe_searchview_drawer .button { border: none; background: white; @@ -1228,8 +1236,7 @@ color: #404040; } .openerp .oe_searchview .oe_searchview_drawer .oe_searchview_advanced h4 { - border-top: 1px solid #cccccc; - margin: 5px 0 3px; + margin: 0; cursor: pointer; } .openerp .oe_searchview .oe_searchview_drawer .oe_searchview_advanced h4:before { diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index 55d56056619..cf35624d4b1 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -932,6 +932,13 @@ $colour4: #8a89ba border: 1px solid #ccc text-align: left + > div + border-top: 1px solid #ccc + margin: 3px 0 + > div:first-child + border-top: none + margin: 0 + button, .button border: none background: white @@ -980,8 +987,7 @@ $colour4: #8a89ba .oe_searchview_advanced h4 - border-top: 1px solid #ccc - margin: 5px 0 3px + margin: 0 cursor: pointer h4:before diff --git a/addons/web/static/src/js/search.js b/addons/web/static/src/js/search.js index 2e4abda7b2a..3a190a538db 100644 --- a/addons/web/static/src/js/search.js +++ b/addons/web/static/src/js/search.js @@ -624,9 +624,11 @@ instance.web.SearchView = instance.web.Widget.extend(/** @lends instance.web.Sea data.fields_view.fields); // add Filters to this.inputs, need view.controls filled - var filters = new instance.web.search.Filters(this); + (new instance.web.search.Filters(this)); + // add custom filters to this.inputs + (new instance.web.search.CustomFilters(this)); // add Advanced to this.inputs - var advanced = new instance.web.search.Advanced(this); + (new instance.web.search.Advanced(this)); // build drawer var drawer_started = $.when.apply( @@ -1479,28 +1481,52 @@ instance.web.search.ManyToOneField = instance.web.search.CharField.extend({ instance.web.search.CustomFilters = instance.web.search.Input.extend({ template: 'SearchView.CustomFilters', + _in_drawer: true, start: function () { + this.model = new instance.web.Model('ir.filters'); + this.filters = {}; this.$element.on('submit', 'form', this.proxy('save_current')); // FIXME: local eval of domain and context to get rid of special endpoint return this.rpc('/web/searchview/get_filters', { model: this.view.model }).pipe(this.proxy('set_filters')); }, - set_filters: function (filters) { + append_filter: function (filter) { var self = this; - var content = this.$element.find('.oe_searchview_custom_list'); - return $.when.apply(null, _(filters).chain() - .map(function (filter) { - // FIXME: handling of ``disabled`` being set - var f = new instance.web.search.Filter({attrs: { - string: filter.name, - context: filter.context, - domain: filter.domain - }}, self.view); - return new instance.web.search.FilterGroup([f], self.view); - }) - .invoke('appendTo', content) - .value()); + var key = _.str.sprintf('(%s)%s', filter.user_id, filter.name); + + var $filter; + if (key in this.filters) { + $filter = this.filters[key]; + } else { + var id = filter.id; + $filter = this.filters[key] = $('
  • ') + .appendTo(this.$element.find('.oe_searchview_custom_list')) + .text(filter.name); + $('
      - - + + + +
    From 323708d83dc298b3a850173907004ad2262f41e6 Mon Sep 17 00:00:00 2001 From: Xavier Morel Date: Fri, 11 May 2012 11:58:22 +0200 Subject: [PATCH 49/81] [IMP] use filter help message if no string on a search filter bzr revid: xmo@openerp.com-20120511095822-eqhuo6isbfvdf44c --- addons/web/static/src/js/search.js | 4 ++-- addons/web/static/src/xml/base.xml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/addons/web/static/src/js/search.js b/addons/web/static/src/js/search.js index 8e826d728c3..0515a2136d0 100644 --- a/addons/web/static/src/js/search.js +++ b/addons/web/static/src/js/search.js @@ -1031,7 +1031,7 @@ instance.web.search.FilterGroup = instance.web.search.Input.extend(/** @lends in .filter(function (f) { return f.attrs && f.attrs.name && !!defaults[f.attrs.name]; }).map(function (f) { - return {label: f.attrs.string || f.attrs.name, + return {label: f.attrs.string || f.attrs.help || f.attrs.name, value: f}; }).value(); if (_.isEmpty(fs)) { return $.when(null); } @@ -1093,7 +1093,7 @@ instance.web.search.FilterGroup = instance.web.search.Input.extend(/** @lends in }, toggle: function (filter) { this.view.query.toggle(this.make_facet([{ - label: filter.attrs.string || filter.attrs.name, + label: filter.attrs.string || filter.attrs.help || filter.attrs.name, value: filter }])); } diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml index 5e8224f0ab3..12db7a4a822 100644 --- a/addons/web/static/src/xml/base.xml +++ b/addons/web/static/src/xml/base.xml @@ -1372,7 +1372,7 @@
    • - +
    From 872c87cc59be880cc7edd102982aa4663fc10bc3 Mon Sep 17 00:00:00 2001 From: Xavier Morel Date: Fri, 11 May 2012 12:24:16 +0200 Subject: [PATCH 50/81] [FIX] test: extracting custom filers from filters groups means one more input in the search view bzr revid: xmo@openerp.com-20120511102416-1zryi8n7t1d33cmi --- addons/web/static/test/search.js | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/addons/web/static/test/search.js b/addons/web/static/test/search.js index ca34750ad1c..ee97e18f571 100644 --- a/addons/web/static/test/search.js +++ b/addons/web/static/test/search.js @@ -995,9 +995,10 @@ $(document).ready(function () { .fail(function (error) { ok(false, error.message); }) .done(function () { var $fs = $fix.find('.oe_searchview_filters ul'); - // 3 filters, 1 filtergroup, 1 advanced and 1 Filters widget - equal(view.inputs.length, 6, - 'view should have 6 inputs total'); + // 3 filters, 1 filtergroup, 1 custom filters widget, + // 1 advanced and 1 Filters widget + equal(view.inputs.length, 7, + 'view should have 7 inputs total'); equal($fs.children().length, 3, "drawer should have a filter group with 3 filters"); equal(_.str.strip($fs.children().eq(0).text()), "Foo1", From f3721bb43b8372308d4d838c6d8aa0ebd0e85eee Mon Sep 17 00:00:00 2001 From: Xavier Morel Date: Fri, 11 May 2012 13:32:22 +0200 Subject: [PATCH 51/81] [FIX] bloody retarded shit from revid:nicolas.vanhoren@openerp.com-20120418145003-vk8kkfgyp0y94hzm bzr revid: xmo@openerp.com-20120511113222-o4vj35vscnbebvh8 --- addons/web/static/src/js/formats.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/web/static/src/js/formats.js b/addons/web/static/src/js/formats.js index 640ba4d5a93..2b527686ddd 100644 --- a/addons/web/static/src/js/formats.js +++ b/addons/web/static/src/js/formats.js @@ -111,7 +111,7 @@ instance.web.format_value = function (value, descriptor, value_if_empty) { return value_if_empty === undefined ? '' : value_if_empty; } var l10n = _t.database.parameters; - switch (descriptor.type || (descriptor.field && descriptor.field.type)) { + switch (descriptor.widget || descriptor.type || (descriptor.field && descriptor.field.type)) { case 'id': return value.toString(); case 'integer': @@ -171,7 +171,7 @@ instance.web.parse_value = function (value, descriptor, value_if_empty) { case "": return value_if_empty === undefined ? false : value_if_empty; } - switch (descriptor.type || (descriptor.field && descriptor.field.type)) { + switch (descriptor.widget || descriptor.type || (descriptor.field && descriptor.field.type)) { case 'integer': var tmp; do { From 7b4137b49ce9038295f3bb12a42d8492bda9109a Mon Sep 17 00:00:00 2001 From: Xavier Morel Date: Fri, 11 May 2012 14:07:26 +0200 Subject: [PATCH 52/81] [FIX] advanced search reimplement facet management internally, don't try to go through facets also tests bzr revid: xmo@openerp.com-20120511120726-ue2y7exuqv2wh22p --- addons/web/static/src/js/search.js | 31 +++++---- addons/web/static/test/search.js | 101 ++++++++++++++++++++++++++++- 2 files changed, 115 insertions(+), 17 deletions(-) diff --git a/addons/web/static/src/js/search.js b/addons/web/static/src/js/search.js index 0515a2136d0..2ec0a79a3cd 100644 --- a/addons/web/static/src/js/search.js +++ b/addons/web/static/src/js/search.js @@ -1644,25 +1644,28 @@ instance.web.search.Advanced = instance.web.search.Input.extend({ commit_search: function () { var self = this; // Get domain sections from all propositions - var children = this.getChildren(), - domain = _.invoke(children, 'get_proposition'); - var filters = _(domain).map(function (section) { + var children = this.getChildren(); + var domain = _.invoke(children, 'get_proposition'); + var vals = _(domain).map(function (section) { return { - label: _.str.sprintf('%s(%s)%s', - section[0], section[1], section[2]), - value: new instance.web.search.Filter({attrs: { - domain: [section] - }}, self.view) - }; + label: _.str.sprintf('%s(%s)%s', section[0], section[1], section[2]), + value: null + } }); - // Create Filter (& FilterGroup around it) with that domain - var f = new instance.web.search.FilterGroup(filters, this.view); - // add group to query + for (var i = domain.length; --i;) { + domain.unshift('|'); + } + this.view.query.add({ category: _t("Advanced"), - values: filters, - field: f + values: vals, + field: { + get_context: function () { }, + get_domain: function () { return domain;}, + get_groupby: function () { } + } }); + // remove all propositions _.invoke(children, 'destroy'); // add new empty proposition diff --git a/addons/web/static/test/search.js b/addons/web/static/test/search.js index ee97e18f571..0295d14ad01 100644 --- a/addons/web/static/test/search.js +++ b/addons/web/static/test/search.js @@ -203,7 +203,7 @@ $(document).ready(function () { return {result: {fields_view: { type: 'search', fields: { - dummy: {type: 'char'} + dummy: {type: 'char', string: "Dummy"} }, arch: { tag: 'search', @@ -225,7 +225,7 @@ $(document).ready(function () { }; instance.connection.responses['/web/searchview/fields_get'] = function () { return {result: {fields: { - dummy: {type: 'char'} + dummy: {type: 'char', string: 'Dummy'} }}}; }; @@ -716,7 +716,7 @@ $(document).ready(function () { var $fix = $('#qunit-fixture'); var view = makeSearchView({ get_domain: function (facet) { - equal(facet.get('category'), "dummy"); + equal(facet.get('category'), "Dummy"); deepEqual(facet.values.toJSON(), [{label: "42", value: 42}]); got_domain = true; return null; @@ -1059,5 +1059,100 @@ $(document).ready(function () { }); }); + module('advanced', { + setup: function () { + instance = window.openerp.init([]); + window.openerp.web.corelib(instance); + window.openerp.web.coresetup(instance); + window.openerp.web.chrome(instance); + window.openerp.web.data(instance); + window.openerp.web.formats(instance); + window.openerp.web.search(instance); + + instance.web.qweb.add_template(doc); + + mockifyRPC(instance.connection); + } + }); + asyncTest('single-advanced', 6, function () { + var view = makeSearchView(); + var $fix = $('#qunit-fixture'); + + view.appendTo($fix) + .always(start) + .fail(function (error) { ok(false, error.message); }) + .done(function () { + var $advanced = $fix.find('.oe_searchview_advanced'); + // open advanced search (not actually useful) + $advanced.find('> h4').click(); + // select proposition (only one) + var $prop = $advanced.find('> form li:first'); + // field select should have two possible values, dummy and id + equal($prop.find('.searchview_extended_prop_field option').length, + 2, "advanced search should provide choice between two fields"); + // field should be dummy + equal($prop.find('.searchview_extended_prop_field').val(), + 'dummy', + "only field should be dummy"); + // operator should be "contains"/'ilike' + equal($prop.find('.searchview_extended_prop_op').val(), + 'ilike', "default char operator should be ilike"); + // put value in + $prop.find('.searchview_extended_prop_value input') + .val("stupid value"); + // validate advanced search + $advanced.find('button.oe_apply').click(); + + // resulting search + equal(view.query.length, 1, "search query should have a single facet"); + var facet = view.query.at(0); + ok(!facet.get('field').get_context(facet), + "advanced search facets should yield no context"); + deepEqual(facet.get('field').get_domain(facet), + [['dummy', 'ilike', "stupid value"]], + "advanced search facet should return proposed domain"); + }); + }); + asyncTest('multiple-advanced', 3, function () { + var view = makeSearchView(); + var $fix = $('#qunit-fixture'); + + view.appendTo($fix) + .always(start) + .fail(function (error) { ok(false, error.message); }) + .done(function () { + var $advanced = $fix.find('.oe_searchview_advanced'); + // open advanced search (not actually useful) + $advanced.find('> h4').click(); + // open second condition + $advanced.find('button.oe_add_condition').click(); + // select first proposition + var $prop1 = $advanced.find('> form li:first'); + $prop1.find('.searchview_extended_prop_field').val('dummy').change(); + $prop1.find('.searchview_extended_prop_op').val('ilike'); + $prop1.find('.searchview_extended_prop_value input') + .val("stupid value"); + + // select first proposition + var $prop2 = $advanced.find('> form li:last'); + // need to trigger event manually or op not changed + $prop2.find('.searchview_extended_prop_field').val('id').change(); + $prop2.find('.searchview_extended_prop_op').val('='); + $prop2.find('.searchview_extended_prop_value input') + .val(42); + // validate advanced search + $advanced.find('button.oe_apply').click(); + + // resulting search + equal(view.query.length, 1, "search query should have a single facet"); + var facet = view.query.at(0); + ok(!facet.get('field').get_context(facet), + "advanced search facets should yield no context"); + deepEqual(facet.get('field').get_domain(facet), + ['|', ['dummy', 'ilike', "stupid value"], + ['id', '=', 42]], + "advanced search facet should return proposed domain"); + }); + }); // TODO: UI tests? }); From 93bf731f2f3a30871c7553c36dd4b49688a0416e Mon Sep 17 00:00:00 2001 From: Xavier Morel Date: Fri, 11 May 2012 14:57:24 +0200 Subject: [PATCH 53/81] [TEST] for clearing search view bzr revid: xmo@openerp.com-20120511125724-we09bm8aif8z4drg --- addons/web/static/test/search.js | 35 ++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/addons/web/static/test/search.js b/addons/web/static/test/search.js index 0295d14ad01..dddf813b9ab 100644 --- a/addons/web/static/test/search.js +++ b/addons/web/static/test/search.js @@ -917,6 +917,41 @@ $(document).ready(function () { }); }); + module('removal', { + setup: function () { + instance = window.openerp.init([]); + window.openerp.web.corelib(instance); + window.openerp.web.coresetup(instance); + window.openerp.web.chrome(instance); + window.openerp.web.data(instance); + window.openerp.web.search(instance); + + instance.web.qweb.add_template(doc); + + mockifyRPC(instance.connection); + } + }); + asyncTest('clear button', function () { + var $fix = $('#qunit-fixture'); + var view = makeSearchView({ + facet_for_defaults: function (defaults) { + return $.when({ + field: this, + category: 'Dummy', + values: [{label: 'dummy', value: defaults.dummy}] + }); + } + }, {dummy: 42}); + view.appendTo($fix) + .always(start) + .fail(function (error) { ok(false, error.message); }) + .done(function () { + equal(view.query.length, 1, "view should have default facet"); + $fix.find('.oe_searchview_clear').click(); + equal(view.query.length, 0, "cleared view should not have any facet"); + }); + }); + module('drawer', { setup: function () { instance = window.openerp.init([]); From 3ecf0e1ae19f9b86251bd0f20154df6a1ad3d2f7 Mon Sep 17 00:00:00 2001 From: Xavier Morel Date: Fri, 11 May 2012 15:16:13 +0200 Subject: [PATCH 54/81] [IMP] doc for facet's field property bzr revid: xmo@openerp.com-20120511131613-zbqye92sex1ius6x --- doc/search-view.rst | 65 ++++++++++++++++++++++++++++++++------------- 1 file changed, 47 insertions(+), 18 deletions(-) diff --git a/doc/search-view.rst b/doc/search-view.rst index 2acaea3c8ad..66ad38d7d91 100644 --- a/doc/search-view.rst +++ b/doc/search-view.rst @@ -14,7 +14,8 @@ multiple fields). The goal for this change is twofold: OpenERP Web's new design. The internal structure of the faceted search is inspired by -`VisualSearch `_ [#]_. +`VisualSearch `_ +[#previous]_. As does VisualSearch, the new search view is based on `Backbone`_ and makes significant use of Backbone's models and collections (OpenERP @@ -63,7 +64,7 @@ contains a non-falsy value for the field's ``@name`` and calls :js:func:`openerp.web.search.Input.facet_for` with that value. There is no default implementation of -:js:func:`openerp.web.search.Input.facet_for` [#]_, but +:js:func:`openerp.web.search.Input.facet_for` [#no_impl]_, but :js:class:`openerp.web.search.Field` provides one, which uses the value as-is to fetch a :js:class:`~openerp.web.search.Facet`. @@ -76,7 +77,8 @@ inputs through the :js:func:`~openerp.web.search.Input.complete` method. This method should take a single argument (the string being typed by -the user) and should fetch an ``Array`` of possible completions [#]_. +the user) and should fetch an ``Array`` of possible completions +[#completion]_. A default implementation is provided which fetches nothing. @@ -205,9 +207,9 @@ with directly by external objects or search view controls .. js:attribute:: field The :js:class:`~openerp.web.search.Input` instance which - originally created the facet, used to delegate some operations - (such as serializing the facet's values to domains and - contexts). This is a backbone model attribute. + originally created the facet [#facet-field]_, used to delegate + some operations (such as serializing the facet's values to + domains and contexts). This is a backbone model attribute. .. js:attribute:: values @@ -262,7 +264,7 @@ OpenERP this is done via :ref:`domains `. On the other hand, the OpenERP Web 7 search view's state is modelled after a collection of :js:class:`~openerp.web.search.Facet`, and each field of a search view may have special requirements when it comes to -the domains it produces [#]_. +the domains it produces [#special]_. So there needs to be some way of mapping :js:class:`~openerp.web.search.Facet` objects to OpenERP search data. @@ -464,20 +466,47 @@ The advanced search is now a more standard :js:class:`~openerp.web.search.Input` configured to be rendered in the drawer. -.. [#] the original view was implemented on top of a monkey-patched - VisualSearch, but as our needs diverged from VisualSearch's goal this - made less and less sense ultimately leading to a clean-room - reimplementation +.. [#previous] -.. [#] In case you are extending the search view with a brand new type - of input + the original view was implemented on top of a monkey-patched + VisualSearch, but as our needs diverged from VisualSearch's goal + this made less and less sense ultimately leading to a clean-room + reimplementation -.. [#] Ideally this array should not hold more than about 10 items, - but the search view does not put any constraint on this at the - moment. Note that this may change. +.. [#no_impl] -.. [#] search view fields may also bundle context data to add to the - search context + In case you are extending the search view with a brand new type of + input + +.. [#completion] + + Ideally this array should not hold more than about 10 items, but + the search view does not put any constraint on this at the + moment. Note that this may change. + +.. [#facet-field] + + ``field`` does not actually need to be an instance of + :js:class:`~openerp.web.search.Input`, nor does it need to be what + created the facet, it just needs to provide the three + facet-serialization methods + :js:func:`~openerp.web.search.Input.get_domain`, + :js:func:`~openerp.web.search.Input.get_context` and + :js:func:`~openerp.web.search.Input.get_gropuby`, existing + :js:class:`~openerp.web.search.Input` subtypes merely provide + convenient base implementation for those methods. + + Complex search view inputs (especially those living in the drawer) + may prefer using object literals with the right slots returning + closed-over values or some other scheme un-bound to an actual + :js:class:`~openerp.web.search.Input`, as + :js:class:`~openerp.web.search.CustomFilters` and + :js:class:`~openerp.web.search.Advanced` do. + +.. [#special] + + search view fields may also bundle context data to add to the + search context .. _Backbone: http://documentcloud.github.com/backbone/ From c20d7cfb47bfbebfac6a8c6322a74b05a8a5c0a1 Mon Sep 17 00:00:00 2001 From: Xavier Morel Date: Fri, 11 May 2012 16:32:25 +0200 Subject: [PATCH 55/81] [IMP] unify open/close behavior of advanced and custom filters, close custom after creating bzr revid: xmo@openerp.com-20120511143225-472ineg91e111tvv --- addons/web/static/src/css/base.css | 25 +++++++++------- addons/web/static/src/css/base.sass | 45 +++++++++++++++-------------- addons/web/static/src/js/search.js | 13 +++++++-- addons/web/static/src/xml/base.xml | 12 ++++---- 4 files changed, 54 insertions(+), 41 deletions(-) diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css index 6d2287aa1c0..11095d7baf1 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -1183,6 +1183,13 @@ border-top: none; margin: 0; } +.openerp .oe_searchview .oe_searchview_drawer h4, .openerp .oe_searchview .oe_searchview_drawer h4 * { + margin: 0; + cursor: pointer; +} +.openerp .oe_searchview .oe_searchview_drawer h4:before { + content: "▸ "; +} .openerp .oe_searchview .oe_searchview_drawer button, .openerp .oe_searchview .oe_searchview_drawer .button { border: none; background: white; @@ -1224,24 +1231,20 @@ .openerp .oe_searchview .oe_searchview_drawer .oe_searchview_filters li:hover { background-color: #f0f0fa; } -.openerp .oe_searchview .oe_searchview_drawer .oe_searchview_custom .oe_searchview_custom_save { +.openerp .oe_searchview .oe_searchview_drawer .oe_searchview_custom form { + display: none; +} +.openerp .oe_searchview .oe_searchview_drawer .oe_searchview_custom form button { font-size: 1px; letter-spacing: -1px; color: transparent; } -.openerp .oe_searchview .oe_searchview_drawer .oe_searchview_custom .oe_searchview_custom_save:before { +.openerp .oe_searchview .oe_searchview_drawer .oe_searchview_custom form button:before { font-family: "mnmliconsRegular"; content: "S"; font-size: 20px; color: #404040; } -.openerp .oe_searchview .oe_searchview_drawer .oe_searchview_advanced h4 { - margin: 0; - cursor: pointer; -} -.openerp .oe_searchview .oe_searchview_drawer .oe_searchview_advanced h4:before { - content: "▸ "; -} .openerp .oe_searchview .oe_searchview_drawer .oe_searchview_advanced form { display: none; } @@ -1259,10 +1262,10 @@ list-style: none; margin: 0; } -.openerp .oe_searchview .oe_searchview_drawer .oe_searchview_advanced.oe_opened h4:before { +.openerp .oe_searchview .oe_searchview_drawer .oe_opened h4:before { content: "▾ "; } -.openerp .oe_searchview .oe_searchview_drawer .oe_searchview_advanced.oe_opened form { +.openerp .oe_searchview .oe_searchview_drawer .oe_opened form { display: block; } .openerp .oe_view_topbar { diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index cf35624d4b1..c1824427f58 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -939,6 +939,13 @@ $colour4: #8a89ba border-top: none margin: 0 + h4, h4 * + margin: 0 + cursor: pointer + + h4:before + content: "▸ " + button, .button border: none background: white @@ -975,24 +982,20 @@ $colour4: #8a89ba background-color: #f0f0fa .oe_searchview_custom - .oe_searchview_custom_save - font-size: 1px - letter-spacing: -1px - color: transparent - &:before - font-family: "mnmliconsRegular" - content: "S" - font-size: 20px - color: #404040 + form + display: none + + button + font-size: 1px + letter-spacing: -1px + color: transparent + &:before + font-family: "mnmliconsRegular" + content: "S" + font-size: 20px + color: #404040 .oe_searchview_advanced - h4 - margin: 0 - cursor: pointer - - h4:before - content: "▸ " - form display: none @@ -1008,11 +1011,11 @@ $colour4: #8a89ba list-style: none margin: 0 - &.oe_opened - h4:before - content: "▾ " - form - display: block + .oe_opened + h4:before + content: "▾ " + form + display: block // }}} // View.topbar {{{ .oe_view_topbar diff --git a/addons/web/static/src/js/search.js b/addons/web/static/src/js/search.js index 2ec0a79a3cd..bce4770339b 100644 --- a/addons/web/static/src/js/search.js +++ b/addons/web/static/src/js/search.js @@ -1483,9 +1483,13 @@ instance.web.search.CustomFilters = instance.web.search.Input.extend({ template: 'SearchView.CustomFilters', _in_drawer: true, start: function () { + var self = this; this.model = new instance.web.Model('ir.filters'); this.filters = {}; this.$element.on('submit', 'form', this.proxy('save_current')); + this.$element.on('click', 'h4', function () { + self.$element.toggleClass('oe_opened'); + }); // FIXME: local eval of domain and context to get rid of special endpoint return this.rpc('/web/searchview/get_filters', { model: this.view.model @@ -1508,7 +1512,8 @@ instance.web.search.CustomFilters = instance.web.search.Input.extend({ $('
      -
      - +

      +

      + - - - +
      + +
    From c692ee6639c50101b148135867f9a49d9ab6d461 Mon Sep 17 00:00:00 2001 From: Xavier Morel Date: Fri, 11 May 2012 16:34:59 +0200 Subject: [PATCH 56/81] [IMP] use button for advanced search clause removal bzr revid: xmo@openerp.com-20120511143459-0kil402r0qp4ed0h --- addons/web/static/src/xml/base.xml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml index f123710edb6..1e4fe45e287 100644 --- a/addons/web/static/src/xml/base.xml +++ b/addons/web/static/src/xml/base.xml @@ -1504,8 +1504,7 @@ \n
    \n\n
    '); -window.JST['search_input'] = _.template(''); -})(); \ No newline at end of file diff --git a/addons/web/static/lib/visualsearch/demo.html b/addons/web/static/lib/visualsearch/demo.html deleted file mode 100755 index 212fb7cee28..00000000000 --- a/addons/web/static/lib/visualsearch/demo.html +++ /dev/null @@ -1,453 +0,0 @@ - - - - - - DocumentCloud's VisualSearch.js - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    - -

    VisualSearch.js

    - -

    - VisualSearch.js - enhances ordinary search boxes with the ability to autocomplete - faceted search queries. Specify the facets for completion, along with the - completable values for any facet. You can retrieve the search query as a - structured object, so you don't have to parse the query string yourself. -

    - -

    - The complete annotated source code - is also available. -

    - -

    - The project is - hosted on GitHub. - You can report bugs and discuss features on the - issues page, - on Freenode in the #documentcloud channel, - or send tweets to @documentcloud. -

    - -

    - VisualSearch.js is an open-source component of DocumentCloud. -

    -

    Demo Try searching for: account, filter, access, title, city, state, or country.

    - -
    -
     
    - - - - - -
    -
     
    - - - -
    - - - diff --git a/addons/web/static/lib/visualsearch/index.html b/addons/web/static/lib/visualsearch/index.html deleted file mode 100755 index 07cc8de20e8..00000000000 --- a/addons/web/static/lib/visualsearch/index.html +++ /dev/null @@ -1,537 +0,0 @@ - - - - - - DocumentCloud's VisualSearch.js - - - - - - - - - - - - - - - -
    - -

    VisualSearch.js

    - -

    - - Created by Samuel Clay, - @samuelclay. - -

    - -

    - VisualSearch.js - enhances ordinary search boxes with the ability to autocomplete - faceted search queries. Specify the facets for completion, along with the - completable values for any facet. You can retrieve the search query as a - structured object, so you don't have to parse the query string yourself. -

    - -

    - Here's an example of a search on DocumentCloud.org that uses facets. -

    - -

    - The project is - hosted on GitHub. - You can report bugs and discuss features on the - issues page, - on Freenode in the #documentcloud channel, - or send tweets to @documentcloud. -

    - -

    - VisualSearch.js is an open-source component of DocumentCloud. -
    - The complete annotated source code - is also available.     -

    - -

    Table of Contents

    - - Demo | Downloads | Usage | Change Log - - -

    Demo Try searching for: account, filter, access, title, city, state, or country.

    - - - -
    -
     
    - - - -

    Downloads (Right-click, and use "Save As")

    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    0. Everything (visualsearch.zip)
    Download everything
    1. VisualSearch JavaScript (visualsearch.js)
    Production Version (0.2.2)8kb, Minified and Gzipped
    Development Version (0.2.2)45kb, Uncompressed with Comments
    2. VisualSearch Stylesheets (visualsearch.css)
    You should include both the datauri and image urls versions. See how to include both
    Production Version - datauri4kb, Minified and Gzipped
    Production Version - image urls4kb, Minified and Gzipped
    Development Version8kb, Uncompressed with Comments
    3. VisualSearch Images
    Search Glyph4kb, embedded in visualsearch-datauri.css
    Cancel Button4kb, embedded in visualsearch-datauri.css
    4. VisualSearch Dependencies (jQuery 1.4+, jQuery UI, Underscore.js, Backbone.js)
    You should only include the dependencies you don't already have.
    Production Version - All49kb, Minified and Gzipped
    Development Version - All340kb, Uncompressed with Comments
    jQuery 1.6.1238kb, Uncompressed with Comments
    jQuery UI 1.8.13:
    Core Position Widget Autocomplete    		48kb, Uncompressed with Comments
    Underscore 1.1.529kb, Uncompressed with Comments
    Backbone 0.5.041kb, Uncompressed with Comments
    - -

    Usage

    - -

    To use VisualSearch.js on your site, follow these instructions on installation, configuration, and customization.

    - -
      -
    1. Insert the JavaScript and CSS into your page:
      - 
      <script src="visualsearch.js" type="text/javascript"></script>
-<!--[if (!IE)|(gte IE 8)]><!-->
-  <link href="visualsearch-datauri.css" media="screen" rel="stylesheet" type="text/css" />
-<!--<![endif]-->
-<!--[if lte IE 7]><!-->
-  <link href="visualsearch.css" media="screen" rel="stylesheet" type="text/css" />
-<!--<![endif]-->
      -
      2. -
    2. Initialize the Visual Search box:
      - 
      <div class="visual_search"></div>
-
-<script type="text/javascript" charset="utf-8">
-  $(document).ready(function() {
-    var visualSearch = VS.init({
-      container : $('.visual_search'),
-      query     : '',
-      callbacks : {
-        search       : function(query, searchCollection) {},
-        facetMatches : function(callback) {},
-        valueMatches : function(facet, searchTerm, callback) {}
-      }
-    });
-  });
-</script>
      -
      3. -
    3. Customize the autocompleted facets and values: - 
      callbacks : {
-  ...
-  // These are the facets that will be autocompleted in an empty input.
-  facetMatches : function(callback) {
-    callback([
-      'account', 'filter', 'access', 'title',
-      { label: 'city',    category: 'location' },
-      { label: 'address', category: 'location' },
-      { label: 'country', category: 'location' },
-      { label: 'state',   category: 'location' },
-    ]);
-  }
-  ...
-  // These are the values that match specific categories, autocompleted
-  // in a category's input field.  searchTerm can be used to filter the
-  // list on the server-side, prior to providing a list to the widget.
-  valueMatches : function(facet, searchTerm, callback) {
-    switch (facet) {
-    case 'account':
-        callback([
-          { value: '1-amanda', label: 'Amanda' },
-          { value: '2-aron',   label: 'Aron' },
-          { value: '3-eric',   label: 'Eric' },
-          { value: '4-jeremy', label: 'Jeremy' },
-          { value: '5-samuel', label: 'Samuel' },
-          { value: '6-scott',  label: 'Scott' }
-        ]);
-        break;
-      case 'filter':
-        callback(['published', 'unpublished', 'draft']);
-        break;
-      case 'access':
-        callback(['public', 'private', 'protected']);
-        break;
-      case 'title':
-        callback([
-          'Pentagon Papers',
-          'CoffeeScript Manual',
-          'Laboratory for Object Oriented Thinking',
-          'A Repository Grows in Brooklyn'
-        ]);
-        break;
-    }
-  }
-...
-}
      -
      4. -
    4. Inspect the Visual Search box - 
      // Returns the unstructured search query
-visualSearch.searchBox.value() 
-// "country: "South Africa" account: 5-samuel title: "Pentagon Papers""
-
-// Returns an array of Facet model instances
-visualSearch.searchQuery.facets()
-// [FacetModel<country:"South Africa">, 
-//  FacetModel<account:5-samuel>, 
-//  FacetModel<title:"Pentagon Papers">]
-
-// Set the search query with raw text
-visualSearch.searchBox.value("Country: US State: \"New York\" Key: Value")
-
-
      -
      5. -
    - - -

    Change Log

    - -

    - 0.2.2 March 10th, 2012
    - If you do not want to automatically filter the value matches, you can pass an - options hash with preserveMatches: true as the second argument to the callback. - See pull request #44 for details. -

    -

    - 0.2.1 November 14th, 2011
    - The autocompleted facets and values that are provided by your callbacks facetMatches - and valueMatches can now preserve the order of items you give them. Simply pass an - options hash with preserveOrder: true as the second argument to the callback. See - the demo page for an example. -

    -

    - 0.2.0 August 10th, 2011
    - Multiple instances of VisualSearch on a single page. VS.init now returns - a reference to the instance. The search callback now contains both the - serialized search query and a reference to the search query collection (as a - Backbone.Collection), - which can be used to manipulate each facet directly. See - the source code for search_query.js for available - methods on the collection. -

    -

    - 0.1.0 June 23rd, 2011
    - Initial release of VisualSearch.js. -

    - -

    - - A DocumentCloud Project - -

    - -
    - - - From ebea74aa2512e4534410a3a9d494fa3d3b01c3dc Mon Sep 17 00:00:00 2001 From: Xavier Morel Date: Wed, 16 May 2012 12:42:48 +0200 Subject: [PATCH 65/81] [IMP] move deletion button for custom filters to the extreme right of the filter's line apr reco, looks better and less likely to be mistakenly clicked bzr revid: xmo@openerp.com-20120516104248-j6sbyv0985xf1n88 --- addons/web/static/src/css/base.css | 17 ++++++++++++++++- addons/web/static/src/css/base.sass | 19 +++++++++++++++++-- 2 files changed, 33 insertions(+), 3 deletions(-) diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css index 1824c3e745d..0a7bfa352a8 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -1307,7 +1307,7 @@ } .openerp .oe_searchview .oe_searchview_drawer button, .openerp .oe_searchview .oe_searchview_drawer .button { border: none; - background: white; + background: transparent; padding: 0 2px; -moz-box-shadow: none; -webkit-box-shadow: none; @@ -1340,6 +1340,7 @@ list-style: none; padding: 3px 6px; height: 14px; + line-height: 14px; color: inherit; cursor: pointer; } @@ -1360,6 +1361,20 @@ font-size: 20px; color: #404040; } +.openerp .oe_searchview .oe_searchview_drawer .oe_searchview_custom li { + cursor: pointer; + position: relative; + line-height: 1.2em; + padding: 2px 20px 2px 10px; +} +.openerp .oe_searchview .oe_searchview_drawer .oe_searchview_custom li:hover { + background-color: #f0f0fa; +} +.openerp .oe_searchview .oe_searchview_drawer .oe_searchview_custom li button { + position: absolute; + top: 0; + right: 5px; +} .openerp .oe_searchview .oe_searchview_drawer .oe_searchview_advanced form { display: none; } diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index cb7f0e30f9e..e97663eadb2 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -4,6 +4,7 @@ $section-title-color: #8786b7 $facets-border: #afafb6 $facets-border-selected: #a6a6fe +$hover-background: #f0f0fa $colour4: #8a89ba // }}} // Mixins {{{ @@ -1066,7 +1067,7 @@ $colour4: #8a89ba button, .button border: none - background: white + background: transparent padding: 0 2px @include box-shadow(none) @include radius(0) @@ -1093,11 +1094,12 @@ $colour4: #8a89ba list-style: none padding: 3px 6px height: 14px + line-height: 14px color: inherit cursor: pointer &:hover - background-color: #f0f0fa + background-color: $hover-background .oe_searchview_custom form @@ -1105,6 +1107,19 @@ $colour4: #8a89ba button @include text-to-icon("S") + li + cursor: pointer + position: relative + line-height: 1.2em + padding: 2px 20px 2px 10px + + &:hover + background-color: $hover-background + + button + position: absolute + top: 0 + right: 5px .oe_searchview_advanced form From 5bd32b9373aaaff2753b73af14e3ff4a4d473699 Mon Sep 17 00:00:00 2001 From: Xavier Morel Date: Wed, 16 May 2012 13:00:49 +0200 Subject: [PATCH 66/81] [IMP] open/close arrow-like thingie for the drawer: have it toggle as in title bzr revid: xmo@openerp.com-20120516110049-ofl4pvkl1l7veo2h --- addons/web/static/src/css/base.css | 7 +++++-- addons/web/static/src/css/base.sass | 6 ++++-- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css index 0a7bfa352a8..8978dd3fc95 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -1194,7 +1194,7 @@ top: 0; right: 0; height: 100%; - line-height: 2em; + line-height: 2.5em; padding: 0 7px 0 4px; color: #cccccc; cursor: pointer; @@ -1203,7 +1203,7 @@ color: #999999; } .openerp .oe_searchview .oe_searchview_unfold_drawer:before { - content: "▾"; + content: "◀"; } .openerp .oe_searchview .oe_searchview_facets:before { color: #cccccc; @@ -1274,6 +1274,9 @@ .openerp .oe_searchview.oe_searchview_open_drawer .oe_searchview_drawer { display: block; } +.openerp .oe_searchview.oe_searchview_open_drawer .oe_searchview_unfold_drawer:before { + content: "▼"; +} .openerp .oe_searchview .oe_searchview_drawer { position: absolute; z-index: 1; diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index e97663eadb2..84ac7cda6fa 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -962,14 +962,14 @@ $colour4: #8a89ba top: 0 right: 0 height: 100% - line-height: 2em + line-height: 2.5em padding: 0 7px 0 4px color: #ccc cursor: pointer &:hover color: #999 &:before - content: "▾" + content: "◀" .oe_searchview_facets &:before @@ -1035,6 +1035,8 @@ $colour4: #8a89ba &.oe_searchview_open_drawer .oe_searchview_drawer display: block + .oe_searchview_unfold_drawer:before + content: "▼" .oe_searchview_drawer position: absolute From 378100e3aca931d8072027963869ae10d0e4e574 Mon Sep 17 00:00:00 2001 From: Xavier Morel Date: Wed, 16 May 2012 14:25:51 +0200 Subject: [PATCH 67/81] [IMP] cleanup advanced search fields bzr revid: xmo@openerp.com-20120516122551-c670k5lrqxnyx5ej --- addons/web/static/src/js/search.js | 58 +++++++++++------------------- addons/web/static/src/xml/base.xml | 13 +++---- doc/search-view.rst | 18 ++++++++-- 3 files changed, 43 insertions(+), 46 deletions(-) diff --git a/addons/web/static/src/js/search.js b/addons/web/static/src/js/search.js index f4620e84309..2ac062e96f3 100644 --- a/addons/web/static/src/js/search.js +++ b/addons/web/static/src/js/search.js @@ -1772,22 +1772,18 @@ instance.web.search.ExtendedSearchProposition = instance.web.OldWidget.extend(/* } var type = field.type; - var obj = instance.web.search.custom_filters.get_object(type); - if(obj === null) { - obj = instance.web.search.custom_filters.get_object("char"); - } - this.value = new (obj) (this); - if(this.value.set_field) { - this.value.set_field(field); + var Field = instance.web.search.custom_filters.get_object(type); + if(!Field) { + Field = instance.web.search.custom_filters.get_object("char"); } + this.value = new Field(this, field); _.each(this.value.operators, function(operator) { $('
    +
    @@ -1513,21 +1514,21 @@ - + - + - + - + - diff --git a/doc/search-view.rst b/doc/search-view.rst index 66ad38d7d91..0fb7657cf2f 100644 --- a/doc/search-view.rst +++ b/doc/search-view.rst @@ -462,9 +462,21 @@ Many To One Advanced Search +++++++++++++++ -The advanced search is now a more standard -:js:class:`~openerp.web.search.Input` configured to be rendered in the -drawer. +* The advanced search is now a more standard + :js:class:`~openerp.web.search.Input` configured to be rendered in + the drawer. + +* :js:class:`~openerp.web.search.ExtendedSearchProposition.Field` are + now standard widgets, with the "right" behaviors (they don't rebind + their ``$element`` in ``start()``) + +* The ad-hoc optional setting of the openerp field descriptor on a + :js:class:`~openerp.web.search.ExtendedSearchProposition.Field` has + been removed, the field descriptor is now passed as second argument + to the + :js:class:`~openerp.web.search.ExtendedSearchProposition.Field`'s + constructor, and bound to its + :js:attr:`~openerp.web.search.ExtendedSearchProposition.Field.field`. .. [#previous] From aa3ef52416b9b5a3d4ebd1d9ccc9f0b9aab40911 Mon Sep 17 00:00:00 2001 From: Xavier Morel Date: Wed, 16 May 2012 15:22:37 +0200 Subject: [PATCH 68/81] [FIX] make display of advanced filters look less purely technical and more human-readable * Use field strings * Use operator labels * If applicable, use human-readable version of field values bzr revid: xmo@openerp.com-20120516132237-z6zacy34sq7ujhg0 --- addons/web/static/src/js/search.js | 54 +++++++++++++++++++++++------- doc/search-view.rst | 6 ++++ 2 files changed, 48 insertions(+), 12 deletions(-) diff --git a/addons/web/static/src/js/search.js b/addons/web/static/src/js/search.js index 2ac062e96f3..118eff17374 100644 --- a/addons/web/static/src/js/search.js +++ b/addons/web/static/src/js/search.js @@ -1690,20 +1690,15 @@ instance.web.search.Advanced = instance.web.search.Input.extend({ var self = this; // Get domain sections from all propositions var children = this.getChildren(); - var domain = _.invoke(children, 'get_proposition'); - var vals = _(domain).map(function (section) { - return { - label: _.str.sprintf('%s(%s)%s', section[0], section[1], section[2]), - value: null - } - }); + var propositions = _.invoke(children, 'get_proposition'); + var domain = _(propositions).pluck('value'); for (var i = domain.length; --i;) { domain.unshift('|'); } this.view.query.add({ category: _t("Advanced"), - values: vals, + values: propositions, field: { get_context: function () { }, get_domain: function () { return domain;}, @@ -1789,10 +1784,21 @@ instance.web.search.ExtendedSearchProposition = instance.web.OldWidget.extend(/* get_proposition: function() { if ( this.attrs.selected == null) return null; - var field = this.attrs.selected.name; - var op = this.$element.find('.searchview_extended_prop_op').val(); - var value = this.value.get_value(); - return [field, op, value]; + var field = this.attrs.selected; + var op = this.$element.find('.searchview_extended_prop_op')[0]; + var operator = op.options[op.selectedIndex]; + return { + label: _.str.sprintf(_t('%(field)s %(operator)s "%(value)s"'), { + field: field.string, + // According to spec, HTMLOptionElement#label should return + // HTMLOptionElement#text when not defined/empty, but it does + // not in older Webkit (between Safari 5.1.5 and Chrome 17) and + // Gecko (pre Firefox 7) browsers, so we need a manual fallback + // for those + operator: operator.label || operator.text, + value: this.value}), + value: [field.name, operator.value, this.value.get_value()] + }; } }); @@ -1800,6 +1806,18 @@ instance.web.search.ExtendedSearchProposition.Field = instance.web.Widget.extend init: function (parent, field) { this._super(parent); this.field = field; + }, + /** + * Returns a human-readable version of the value, in case the "logical" + * and the "semantic" values of a field differ (as for selection fields, + * for instance). + * + * The default implementation simply returns the value itself. + * + * @return {String} human-readable version of the value + */ + toString: function () { + return this.get_value(); } }); instance.web.search.ExtendedSearchProposition.Char = instance.web.search.ExtendedSearchProposition.Field.extend({ @@ -1852,6 +1870,9 @@ instance.web.search.ExtendedSearchProposition.Integer = instance.web.search.Exte {value: ">=", text: _lt("greater or equal than")}, {value: "<=", text: _lt("less or equal than")} ], + toString: function () { + return this.$element.val(); + }, get_value: function() { try { return instance.web.parse_value(this.$element.val(), {'widget': 'integer'}); @@ -1873,6 +1894,9 @@ instance.web.search.ExtendedSearchProposition.Float = instance.web.search.Extend {value: ">=", text: _lt("greater or equal than")}, {value: "<=", text: _lt("less or equal than")} ], + toString: function () { + return this.$element.val(); + }, get_value: function() { try { return instance.web.parse_value(this.$element.val(), {'widget': 'float'}); @@ -1887,6 +1911,11 @@ instance.web.search.ExtendedSearchProposition.Selection = instance.web.search.Ex {value: "=", text: _lt("is")}, {value: "!=", text: _lt("is not")} ], + toString: function () { + var select = this.$element[0]; + var option = select.options[select.selectedIndex]; + return option.label || option.text; + }, get_value: function() { return this.$element.val(); } @@ -1897,6 +1926,7 @@ instance.web.search.ExtendedSearchProposition.Boolean = instance.web.search.Exte {value: "=", text: _lt("is true")}, {value: "!=", text: _lt("is false")} ], + toString: function () { return ''; }, get_value: function() { return true; } diff --git a/doc/search-view.rst b/doc/search-view.rst index 0fb7657cf2f..02a239924e5 100644 --- a/doc/search-view.rst +++ b/doc/search-view.rst @@ -478,6 +478,12 @@ Advanced Search constructor, and bound to its :js:attr:`~openerp.web.search.ExtendedSearchProposition.Field.field`. +* Instead of its former domain triplet ``(field, operator, value)``, + :js:func:`~openerp.web.search.ExtendedSearchProposition.get_proposition` + now returns an object with two fields ``label`` and ``value``, + respectively a human-readable version of the proposition and the + corresponding domain triplet for the proposition. + .. [#previous] the original view was implemented on top of a monkey-patched From ffbd7480a419c52f2a2ec5409277e4a45a76e069 Mon Sep 17 00:00:00 2001 From: Xavier Morel Date: Fri, 18 May 2012 13:12:02 +0200 Subject: [PATCH 69/81] [ADD] 'locked' icon on non-public custom filters Icon is kind-of crummy, but none of the iconic font's icons work, they're too small to work correctly (especially when using both locked and unlocked, they can't be distinguished below a font size of ~48) bzr revid: xmo@openerp.com-20120518111202-3h19grpq5cxgejg0 --- addons/web/static/src/css/base.css | 5 ++++- addons/web/static/src/css/base.sass | 6 +++++- addons/web/static/src/js/search.js | 4 +--- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css index 8978dd3fc95..5dcc1f3b8a9 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -1368,7 +1368,10 @@ cursor: pointer; position: relative; line-height: 1.2em; - padding: 2px 20px 2px 10px; + padding: 2px 20px 2px 25px; +} +.openerp .oe_searchview .oe_searchview_drawer .oe_searchview_custom li.oe_searchview_custom_private { + background: url(/web/static/src/img/icons/terp-locked.png) 5px center no-repeat; } .openerp .oe_searchview .oe_searchview_drawer .oe_searchview_custom li:hover { background-color: #f0f0fa; diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index 84ac7cda6fa..ecade4ff30e 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -1113,7 +1113,10 @@ $colour4: #8a89ba cursor: pointer position: relative line-height: 1.2em - padding: 2px 20px 2px 10px + padding: 2px 20px 2px 25px + + &.oe_searchview_custom_private + background: url(/web/static/src/img/icons/terp-locked.png) 5px center no-repeat &:hover background-color: $hover-background @@ -1123,6 +1126,7 @@ $colour4: #8a89ba top: 0 right: 5px + .oe_searchview_advanced form display: none diff --git a/addons/web/static/src/js/search.js b/addons/web/static/src/js/search.js index 118eff17374..7d3f31f18de 100644 --- a/addons/web/static/src/js/search.js +++ b/addons/web/static/src/js/search.js @@ -1597,9 +1597,7 @@ instance.web.search.CustomFilters = instance.web.search.Input.extend({ }; // FIXME: current context? return self.model.call('create_or_replace', [filter]).then(function (id) { - if (id) { - filter.id = id; - } + filter.id = id; self.append_filter(filter); self.$element .removeClass('oe_opened') From ce18f726b4b9694181ba2e84f36bea98ca049ce7 Mon Sep 17 00:00:00 2001 From: Xavier Morel Date: Fri, 18 May 2012 16:00:01 +0200 Subject: [PATCH 70/81] [IMP] move manage_filters to viewmanager's debug menu bzr revid: xmo@openerp.com-20120518140001-jbocagvn7weqlqq3 --- addons/web/static/src/js/search.js | 11 ----------- addons/web/static/src/js/views.js | 11 +++++++++++ addons/web/static/src/xml/base.xml | 1 + 3 files changed, 12 insertions(+), 11 deletions(-) diff --git a/addons/web/static/src/js/search.js b/addons/web/static/src/js/search.js index 7d3f31f18de..2532dead00d 100644 --- a/addons/web/static/src/js/search.js +++ b/addons/web/static/src/js/search.js @@ -665,17 +665,6 @@ instance.web.SearchView = instance.web.Widget.extend(/** @lends instance.web.Sea case 'add_to_dashboard': this.on_add_to_dashboard(); break; - case 'manage_filters': - this.do_action({ - res_model: 'ir.filters', - views: [[false, 'list'], [false, 'form']], - type: 'ir.actions.act_window', - context: {"search_default_user_id": this.session.uid, - "search_default_model_id": this.dataset.model}, - target: "current", - limit : 80 - }); - break; case '': this.do_clear(); } diff --git a/addons/web/static/src/js/views.js b/addons/web/static/src/js/views.js index d2387c1ba3f..abc62f8fcd7 100644 --- a/addons/web/static/src/js/views.js +++ b/addons/web/static/src/js/views.js @@ -607,6 +607,17 @@ instance.web.ViewManagerAction = instance.web.ViewManager.extend({ case 'edit': this.do_edit_resource($option.data('model'), $option.data('id'), { name : $option.text() }); break; + case 'manage_filters': + this.do_action({ + res_model: 'ir.filters', + views: [[false, 'list'], [false, 'form']], + type: 'ir.actions.act_window', + context: { + search_default_my_filters: true, + search_default_model_id: this.dataset.model + } + }); + break; default: if (val) { console.log("No debug handler for ", val); diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml index 2919aaeea42..f37dbbddc04 100644 --- a/addons/web/static/src/xml/base.xml +++ b/addons/web/static/src/xml/base.xml @@ -453,6 +453,7 @@ + From 1568d25eb06648d7963fa4fffa06e519b5af2eae Mon Sep 17 00:00:00 2001 From: Xavier Morel Date: Fri, 18 May 2012 17:23:42 +0200 Subject: [PATCH 71/81] [ADD] marking of currently selected filters in the drawer Visually hints to users currently manipulating the drawer that a given filter is currently selected. bzr revid: xmo@openerp.com-20120518152342-xmqhwlml0bsgodhq --- addons/web/static/src/css/base.css | 5 +++- addons/web/static/src/css/base.sass | 6 ++++- addons/web/static/src/js/search.js | 36 +++++++++++++++++++++++++---- 3 files changed, 41 insertions(+), 6 deletions(-) diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css index 5dcc1f3b8a9..37b4de1dd32 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -1341,12 +1341,15 @@ } .openerp .oe_searchview .oe_searchview_drawer .oe_searchview_filters li { list-style: none; - padding: 3px 6px; + padding: 3px 6px 3px 18px; height: 14px; line-height: 14px; color: inherit; cursor: pointer; } +.openerp .oe_searchview .oe_searchview_drawer .oe_searchview_filters li.oe_selected { + background: url(/web/static/src/img/icons/gtk-apply.png) left center no-repeat; +} .openerp .oe_searchview .oe_searchview_drawer .oe_searchview_filters li:hover { background-color: #f0f0fa; } diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index ecade4ff30e..67e2399069b 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -1094,15 +1094,19 @@ $colour4: #8a89ba li list-style: none - padding: 3px 6px + padding: 3px 6px 3px 18px height: 14px line-height: 14px color: inherit cursor: pointer + &.oe_selected + background: url(/web/static/src/img/icons/gtk-apply.png) left center no-repeat + // after oe_selected so background color is not overridden &:hover background-color: $hover-background + .oe_searchview_custom form display: none diff --git a/addons/web/static/src/js/search.js b/addons/web/static/src/js/search.js index 2532dead00d..91423b5c53e 100644 --- a/addons/web/static/src/js/search.js +++ b/addons/web/static/src/js/search.js @@ -644,8 +644,7 @@ instance.web.SearchView = instance.web.Widget.extend(/** @lends instance.web.Sea // load defaults var defaults_fetched = $.when.apply(null, _(this.inputs).invoke( 'facet_for_defaults', this.defaults)).then(function () { - self.query.reset(_(arguments).compact(), {silent: true}); - self.renderFacets(); + self.query.reset(_(arguments).compact(), {preventSearch: true}); }); return $.when(drawer_started, defaults_fetched) @@ -800,7 +799,10 @@ instance.web.SearchView = instance.web.Widget.extend(/** @lends instance.web.Sea * * @param e jQuery event object coming from the "Search" button */ - do_search: function () { + do_search: function (_query, options) { + if (options && options.preventSearch) { + return; + } var search = this.build_search_data(); if (!_.isEmpty(search.errors)) { this.on_invalid(search.errors); @@ -1009,11 +1011,34 @@ instance.web.search.FilterGroup = instance.web.search.Input.extend(/** @lends in } this._super(view); this.filters = filters; + this.view.query.on('add remove change reset', this.proxy('search_change')); }, start: function () { this.$element.on('click', 'li', this.proxy('toggle_filter')); return $.when(null); }, + /** + * Handles change of the search query: any of the group's filter which is + * in the search query should be visually checked in the drawer + */ + search_change: function () { + var self = this; + var $filters = this.$element.find('> li').removeClass('oe_selected'); + var facet = this.view.query.find(_.bind(this.match_facet, this)); + if (!facet) { return; } + facet.values.each(function (v) { + var i = _(self.filters).indexOf(v.get('value')); + if (i === -1) { return; } + $filters.eq(i).addClass('oe_selected'); + }); + }, + /** + * Matches the group to a facet, in order to find if the group is + * represented in the current search query + */ + match_facet: function (facet) { + return facet.get('field') === this; + }, make_facet: function (values) { return { category: _t("Filter"), @@ -1130,7 +1155,7 @@ instance.web.search.GroupbyGroup = instance.web.search.FilterGroup.extend({ this._super(filters, view); // Not flanders: facet unicity is handled through the // (category, field) pair of facet attributes. This is all well and - // good for regular filter groups where a group matche a facet, but for + // good for regular filter groups where a group matches a facet, but for // groupby we want a single facet. So cheat: add an attribute on the // view which proxies to the first GroupbyGroup, so it can be used // for every GroupbyGroup and still provides the various methods needed @@ -1144,6 +1169,9 @@ instance.web.search.GroupbyGroup = instance.web.search.FilterGroup.extend({ } } }, + match_facet: function (facet) { + return facet.get('field') === this.getParent()._s_groupby; + }, make_facet: function (values) { return { category: _t("GroupBy"), From 1c09d982bc5dc993d185e0a3a2195b531723ab39 Mon Sep 17 00:00:00 2001 From: Xavier Morel Date: Mon, 21 May 2012 09:25:00 +0200 Subject: [PATCH 72/81] [ADD] note about non-standard fields in facets and facet values bzr revid: xmo@openerp.com-20120521072500-bzjlrybvtepgryq2 --- doc/search-view.rst | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/doc/search-view.rst b/doc/search-view.rst index 02a239924e5..f94132bf3bd 100644 --- a/doc/search-view.rst +++ b/doc/search-view.rst @@ -376,8 +376,17 @@ necessarily having to reimplement all of or ``@filter_domain``. ``"="`` for :js:class:`~openerp.web.search.Field` -Converting to facet objects ---------------------------- +Arbitrary data storage +++++++++++++++++++++++ + +:js:class:`~openerp.web.search.Facet` and +:js:class:`~openerp.web.search.FacetValue` objects (and structures) +provided by your widgets should never be altered by the search view +(or an other widget). This means you are free to add arbitrary fields +in these structures if you need to (because you have more complex +needs than the attributes described in this document). + +Ideally this should be avoided, but the possibility remains. Changes ------- From 4fe1d0bc50de26ed087ed6277986e2aed3029edb Mon Sep 17 00:00:00 2001 From: Xavier Morel Date: Mon, 21 May 2012 11:05:47 +0200 Subject: [PATCH 73/81] [FIX] in-drawer filter look in case of very long name also, add help tooltip if the filter has an @help and an @string bzr revid: xmo@openerp.com-20120521090547-99d7pom8k8dbw6z0 --- addons/web/static/src/css/base.css | 3 +-- addons/web/static/src/css/base.sass | 3 +-- addons/web/static/src/xml/base.xml | 3 ++- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css index 37b4de1dd32..c101e1beb0b 100644 --- a/addons/web/static/src/css/base.css +++ b/addons/web/static/src/css/base.css @@ -1342,13 +1342,12 @@ .openerp .oe_searchview .oe_searchview_drawer .oe_searchview_filters li { list-style: none; padding: 3px 6px 3px 18px; - height: 14px; line-height: 14px; color: inherit; cursor: pointer; } .openerp .oe_searchview .oe_searchview_drawer .oe_searchview_filters li.oe_selected { - background: url(/web/static/src/img/icons/gtk-apply.png) left center no-repeat; + background: url(/web/static/src/img/icons/gtk-apply.png) left 2px no-repeat; } .openerp .oe_searchview .oe_searchview_drawer .oe_searchview_filters li:hover { background-color: #f0f0fa; diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass index 67e2399069b..ca47ebf1edb 100644 --- a/addons/web/static/src/css/base.sass +++ b/addons/web/static/src/css/base.sass @@ -1095,13 +1095,12 @@ $colour4: #8a89ba li list-style: none padding: 3px 6px 3px 18px - height: 14px line-height: 14px color: inherit cursor: pointer &.oe_selected - background: url(/web/static/src/img/icons/gtk-apply.png) left center no-repeat + background: url(/web/static/src/img/icons/gtk-apply.png) left 2px no-repeat // after oe_selected so background color is not overridden &:hover background-color: $hover-background diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml index f37dbbddc04..43dd5ebbd24 100644 --- a/addons/web/static/src/xml/base.xml +++ b/addons/web/static/src/xml/base.xml @@ -1378,7 +1378,8 @@
      -
    • +
    From ddd8c6ef9609185c21d7af1f0896d235511b56d2 Mon Sep 17 00:00:00 2001 From: Xavier Morel Date: Mon, 21 May 2012 12:07:31 +0200 Subject: [PATCH 74/81] [FIX] bloody goat bzr revid: xmo@openerp.com-20120521100731-zi6bkkwtj1w3cc1i --- addons/web/static/src/xml/base.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml index 43dd5ebbd24..86b2f67cf62 100644 --- a/addons/web/static/src/xml/base.xml +++ b/addons/web/static/src/xml/base.xml @@ -1379,7 +1379,7 @@
    • + t-att-title="filter.attrs.string ? filter.attrs.help : undefined">
    From a83e6221c857eecd4e540056081d2904779c9490 Mon Sep 17 00:00:00 2001 From: Xavier Morel Date: Mon, 21 May 2012 12:43:34 +0200 Subject: [PATCH 75/81] [FIX] stupid mistype/wrong variable name in Date/DateTime's Facet -> domain conversion bzr revid: xmo@openerp.com-20120521104334-1zfyjdjbxeajgg2c --- addons/web/static/src/js/search.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/web/static/src/js/search.js b/addons/web/static/src/js/search.js index 91423b5c53e..e569e44df28 100644 --- a/addons/web/static/src/js/search.js +++ b/addons/web/static/src/js/search.js @@ -1451,7 +1451,7 @@ instance.web.search.BooleanField = instance.web.search.SelectionField.extend(/** */ instance.web.search.DateField = instance.web.search.Field.extend(/** @lends instance.web.search.DateField# */{ value_from: function (facetValue) { - return openerp.web.date_to_str(facetValue.get('value')); + return instance.web.date_to_str(facetValue.get('value')); }, complete: function (needle) { var d = Date.parse(needle); @@ -1484,7 +1484,7 @@ instance.web.search.DateField = instance.web.search.Field.extend(/** @lends inst */ instance.web.search.DateTimeField = instance.web.search.DateField.extend(/** @lends instance.web.search.DateTimeField# */{ value_from: function (facetValue) { - return openerp.web.datetime_to_str(facetValue.get('value')); + return instance.web.datetime_to_str(facetValue.get('value')); } }); instance.web.search.ManyToOneField = instance.web.search.CharField.extend({ From 174362aac03f2d19b655568c96fdc8aadb20826a Mon Sep 17 00:00:00 2001 From: Xavier Morel Date: Tue, 22 May 2012 08:46:07 +0200 Subject: [PATCH 76/81] [FIX] display issue with boolean fields in drawer's advanced search bzr revid: xmo@openerp.com-20120522064607-2umxpgnltysjnmhq --- addons/web/static/src/js/search.js | 2 +- addons/web/static/src/xml/base.xml | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/addons/web/static/src/js/search.js b/addons/web/static/src/js/search.js index e569e44df28..c70cf2ab470 100644 --- a/addons/web/static/src/js/search.js +++ b/addons/web/static/src/js/search.js @@ -1936,7 +1936,7 @@ instance.web.search.ExtendedSearchProposition.Selection = instance.web.search.Ex } }); instance.web.search.ExtendedSearchProposition.Boolean = instance.web.search.ExtendedSearchProposition.Field.extend({ - template: 'SearchView.extended_search.proposition.boolean', + template: 'SearchView.extended_search.proposition.empty', operators: [ {value: "=", text: _lt("is true")}, {value: "!=", text: _lt("is false")} diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml index 86b2f67cf62..28cba6062d7 100644 --- a/addons/web/static/src/xml/base.xml +++ b/addons/web/static/src/xml/base.xml @@ -1527,8 +1527,6 @@ - -