From cbf9c244beab1689c1499baad9a3084d18625474 Mon Sep 17 00:00:00 2001 From: "Jagdish Panchal (Open ERP)" Date: Tue, 10 Apr 2012 12:46:27 +0530 Subject: [PATCH 001/263] [IMP] set home page of all menus bzr revid: jap@tinyerp.com-20120410071627-4gk2gz2fhf45ruux --- addons/account/account_invoice_view.xml | 3 +++ addons/account/board_account_view.xml | 2 +- addons/document/board_document_view.xml | 4 ++-- addons/document/document_view.xml | 4 ++++ addons/event/event_view.xml | 2 ++ addons/hr/hr_board.xml | 2 +- addons/hr/hr_view.xml | 3 +++ addons/membership/membership_view.xml | 2 ++ addons/mrp/board_manufacturing_view.xml | 4 ++-- addons/mrp/mrp_view.xml | 3 +++ addons/project/board_project_view.xml | 4 ++-- addons/project/project_view.xml | 3 +++ addons/purchase/board_purchase_view.xml | 2 +- addons/purchase/purchase_view.xml | 11 +++++++---- .../purchase_requisition_view.xml | 2 +- addons/sale/board_sale_view.xml | 4 ++-- addons/sale/sale_view.xml | 2 +- addons/stock/board_warehouse_view.xml | 2 +- addons/stock/stock_view.xml | 5 ++++- 19 files changed, 45 insertions(+), 19 deletions(-) diff --git a/addons/account/account_invoice_view.xml b/addons/account/account_invoice_view.xml index 6d499b4d3ad..4444c51dd02 100644 --- a/addons/account/account_invoice_view.xml +++ b/addons/account/account_invoice_view.xml @@ -430,6 +430,9 @@ With Customer Invoices you can create and manage sales invoices issued to your customers. OpenERP can also generate draft invoices automatically from sales orders or deliveries. You should only confirm them before sending them to your customers. + diff --git a/addons/account/board_account_view.xml b/addons/account/board_account_view.xml index 6417bb99d88..1d7865c0f01 100644 --- a/addons/account/board_account_view.xml +++ b/addons/account/board_account_view.xml @@ -63,7 +63,7 @@ - + diff --git a/addons/document/board_document_view.xml b/addons/document/board_document_view.xml index 4412423c97b..44fb44d2a18 100644 --- a/addons/document/board_document_view.xml +++ b/addons/document/board_document_view.xml @@ -49,8 +49,8 @@ id="menu_reports_document_manager" icon="terp-graph"/> - + board.document.manager.form1 diff --git a/addons/document/document_view.xml b/addons/document/document_view.xml index e426444f26d..4ddd85bb8f7 100644 --- a/addons/document/document_view.xml +++ b/addons/document/document_view.xml @@ -357,6 +357,10 @@ action="action_document_file_form" id="menu_document_files" parent="menu_document_doc"/> + + + ir.actions.act_window diff --git a/addons/event/event_view.xml b/addons/event/event_view.xml index 0825cef42c5..200b9f88237 100644 --- a/addons/event/event_view.xml +++ b/addons/event/event_view.xml @@ -304,6 +304,8 @@ Event is the low level object used by meeting and others documents that should be synchronized with mobile devices or calendar applications through caldav. Most of the users should work in the Calendar menu, and not in the list of events. + + - + diff --git a/addons/hr/hr_view.xml b/addons/hr/hr_view.xml index a954d916385..df5de845c9e 100644 --- a/addons/hr/hr_view.xml +++ b/addons/hr/hr_view.xml @@ -188,6 +188,9 @@ Here you can manage your work force by creating employees and assigning them specific properties in the system. Maintain all employee related information and keep track of anything that needs to be recorded for them. The personal information tab will help you maintain their identity data. The Categories tab gives you the opportunity to assign them related employee categories depending on their position and activities within the company. A category can be a seniority level within the company or a department. The Timesheets tab allows to assign them a specific timesheet and analytic journal where they will be able to enter time through the system. In the note tab, you can enter text data that should be recorded for a specific employee. + + kanban diff --git a/addons/membership/membership_view.xml b/addons/membership/membership_view.xml index bdb04525d43..074bed97fcd 100644 --- a/addons/membership/membership_view.xml +++ b/addons/membership/membership_view.xml @@ -208,6 +208,8 @@ + + diff --git a/addons/mrp/board_manufacturing_view.xml b/addons/mrp/board_manufacturing_view.xml index cb81d51d439..4ce4f5e5995 100644 --- a/addons/mrp/board_manufacturing_view.xml +++ b/addons/mrp/board_manufacturing_view.xml @@ -35,8 +35,8 @@ id="menu_board_manufacturing" parent="menus_dash_mrp" sequence="1"/> - + diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml index f96147e9344..7533ddea12e 100644 --- a/addons/mrp/mrp_view.xml +++ b/addons/mrp/mrp_view.xml @@ -840,6 +840,9 @@ + + Manufacturing Orders ir.actions.act_window diff --git a/addons/project/board_project_view.xml b/addons/project/board_project_view.xml index f4a855283ba..bca37ac3fc4 100644 --- a/addons/project/board_project_view.xml +++ b/addons/project/board_project_view.xml @@ -117,9 +117,9 @@ parent="menu_project_dashboard" sequence="1"/> - + name="Project" sequence="10" action="open_board_project"/> --> diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml index 95538513f0c..2b86de95427 100644 --- a/addons/project/project_view.xml +++ b/addons/project/project_view.xml @@ -542,6 +542,9 @@ + + Overpassed Tasks project.task diff --git a/addons/purchase/board_purchase_view.xml b/addons/purchase/board_purchase_view.xml index 4c9e776b96b..4d8280059b0 100644 --- a/addons/purchase/board_purchase_view.xml +++ b/addons/purchase/board_purchase_view.xml @@ -116,7 +116,7 @@ parent="menu_purchase_deshboard" sequence="4"/> - + diff --git a/addons/purchase/purchase_view.xml b/addons/purchase/purchase_view.xml index 007c85b98f1..4de426e71f9 100644 --- a/addons/purchase/purchase_view.xml +++ b/addons/purchase/purchase_view.xml @@ -3,7 +3,7 @@ @@ -312,8 +312,11 @@ - + sequence="0"/> + + + Purchase Orders ir.actions.act_window @@ -323,7 +326,7 @@ Use this menu to search within your purchase orders by references, supplier, products, etc. For each purchase order, you can track the products received, and control the supplier invoices. - + diff --git a/addons/purchase_requisition/purchase_requisition_view.xml b/addons/purchase_requisition/purchase_requisition_view.xml index d6a736eea9c..5e77f46b1a2 100644 --- a/addons/purchase_requisition/purchase_requisition_view.xml +++ b/addons/purchase_requisition/purchase_requisition_view.xml @@ -173,7 +173,7 @@ diff --git a/addons/sale/board_sale_view.xml b/addons/sale/board_sale_view.xml index 8a6caf1a849..4d45151dece 100644 --- a/addons/sale/board_sale_view.xml +++ b/addons/sale/board_sale_view.xml @@ -124,9 +124,9 @@ - + name="Sales"/> --> diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml index 09ad9381e26..6feff81e9ee 100644 --- a/addons/sale/sale_view.xml +++ b/addons/sale/sale_view.xml @@ -1,7 +1,7 @@ diff --git a/addons/stock/board_warehouse_view.xml b/addons/stock/board_warehouse_view.xml index b8de9cf445e..a24f59aa08f 100644 --- a/addons/stock/board_warehouse_view.xml +++ b/addons/stock/board_warehouse_view.xml @@ -70,7 +70,7 @@ - + diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml index 592cb180d22..1d81f80829c 100644 --- a/addons/stock/stock_view.xml +++ b/addons/stock/stock_view.xml @@ -4,7 +4,7 @@ @@ -1924,6 +1924,9 @@ Stock Management + + From 4347226b1d16f73c84f9606b613ec0053602d628 Mon Sep 17 00:00:00 2001 From: "Jagdish Panchal (Open ERP)" Date: Tue, 10 Apr 2012 16:21:25 +0530 Subject: [PATCH 002/263] [IMP] board: improve xml code to set module kanban on setting main menu bzr revid: jap@tinyerp.com-20120410105125-ysmtfc1qgizmldly --- addons/board/board_data_admin.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/board/board_data_admin.xml b/addons/board/board_data_admin.xml index 5f8c2f1b05c..88580c3deb5 100644 --- a/addons/board/board_data_admin.xml +++ b/addons/board/board_data_admin.xml @@ -54,7 +54,7 @@ - + From a163b926e393ef63b30c5f23aad2d652be7ef57d Mon Sep 17 00:00:00 2001 From: "DBR (OpenERP)" Date: Wed, 18 Apr 2012 17:54:59 +0530 Subject: [PATCH 003/263] [IMP]stock: click on warehouse menu tn open product kanban view bzr revid: dbr@tinyerp.com-20120418122459-l27y5wa1b38oaid6 --- addons/product/product_view.xml | 11 +++++++++-- addons/stock/stock_view.xml | 2 +- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/addons/product/product_view.xml b/addons/product/product_view.xml index 2a12fc9ad08..b721dd2031d 100644 --- a/addons/product/product_view.xml +++ b/addons/product/product_view.xml @@ -263,19 +263,26 @@ - + tree - + form + + + kanban + + + + diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml index cfa73a8806d..4edc1cef753 100644 --- a/addons/stock/stock_view.xml +++ b/addons/stock/stock_view.xml @@ -5,7 +5,7 @@ + web_icon_hover="images/warehouse-hover.png" action="product.product_normal_action"/> From c6ee2737b344ce7f211eac70c9b57c3b7850ea5f Mon Sep 17 00:00:00 2001 From: "DBR (OpenERP)" Date: Thu, 19 Apr 2012 12:58:30 +0530 Subject: [PATCH 004/263] [IMP]sale : remove action of partner form bzr revid: dbr@tinyerp.com-20120419072830-gu41w6tmdmfgowp5 --- addons/hr/hr_board.xml | 1 - addons/sale/sale_view.xml | 3 +-- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/addons/hr/hr_board.xml b/addons/hr/hr_board.xml index 20c0e626619..582d6175d8b 100644 --- a/addons/hr/hr_board.xml +++ b/addons/hr/hr_board.xml @@ -24,7 +24,6 @@ - diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml index 9b6ede9a278..fc9bc907b1e 100644 --- a/addons/sale/sale_view.xml +++ b/addons/sale/sale_view.xml @@ -2,8 +2,7 @@ + id="base.menu_base_partner" name="Sales" sequence="0" groups="base.group_sale_salesman,base.group_sale_manager"/> From d30492d5e316feb39772bae44906712e697c666b Mon Sep 17 00:00:00 2001 From: "DBR (OpenERP)" Date: Thu, 19 Apr 2012 16:04:08 +0530 Subject: [PATCH 005/263] [IMP]sale: Add action bzr revid: dbr@tinyerp.com-20120419103408-d3fag9s327hdow8h --- addons/sale/sale_view.xml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml index fc9bc907b1e..9a0147ef909 100644 --- a/addons/sale/sale_view.xml +++ b/addons/sale/sale_view.xml @@ -1,8 +1,6 @@ - + From b3d0828564370a97f340b567131425fc8ba9e8c8 Mon Sep 17 00:00:00 2001 From: Xavier Morel Date: Mon, 23 Apr 2012 11:50:57 +0200 Subject: [PATCH 006/263] [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 f490733e49e366ef2297ee6afc76f1db27781a14 Mon Sep 17 00:00:00 2001 From: "DBR (OpenERP)" Date: Mon, 23 Apr 2012 18:41:07 +0530 Subject: [PATCH 007/263] [IMP]project: set project action for a project menu bzr revid: dbr@tinyerp.com-20120423131107-eaoqtajoxyk12i8l --- addons/project/project_view.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml index 8a708a5a0f8..1344566c6bf 100644 --- a/addons/project/project_view.xml +++ b/addons/project/project_view.xml @@ -547,7 +547,7 @@ - From 9046ab46fa7df9dcca66e17380823c55bb87267d Mon Sep 17 00:00:00 2001 From: Xavier Morel Date: Tue, 24 Apr 2012 12:59:41 +0200 Subject: [PATCH 008/263] [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 009/263] [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 010/263] [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 5fbb9b5e6adf552875d651c5751c738562eaf28f Mon Sep 17 00:00:00 2001 From: "Turkesh Patel (Open ERP)" Date: Wed, 25 Apr 2012 17:23:27 +0530 Subject: [PATCH 011/263] [IMP] crm: improved view bzr revid: tpa@tinyerp.com-20120425115327-0zhzw6pihh02p98n --- addons/crm/crm_lead_view.xml | 10 ++++----- addons/crm/crm_phonecall_view.xml | 34 ++++++++++++++----------------- 2 files changed, 20 insertions(+), 24 deletions(-) diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml index 7de9858713a..40bca1a6dab 100644 --- a/addons/crm/crm_lead_view.xml +++ b/addons/crm/crm_lead_view.xml @@ -53,12 +53,12 @@
-
+ @@ -103,25 +114,10 @@ - - - -
+ @@ -102,25 +113,6 @@ - - - -
+ + @@ -64,30 +76,6 @@ - - - -
+ + @@ -96,13 +106,6 @@ - - -
+ @@ -368,12 +377,7 @@ - - -
+ @@ -198,20 +209,7 @@ - - - -
+ @@ -99,14 +110,6 @@ - - -
+ @@ -87,17 +98,13 @@ - - -
+ + @@ -137,17 +147,12 @@ - - -
    -
  • +
From e95eee2bce720c24211c3f18e9dd796f0f25ad1f Mon Sep 17 00:00:00 2001 From: "Amit Patel (OpenERP)" Date: Mon, 21 May 2012 14:53:29 +0530 Subject: [PATCH 223/263] [IMP]:base_calendar:set statusbar at top bzr revid: apa@tinyerp.com-20120521092329-usq1wbnmjlpkg5nf --- addons/base_calendar/base_calendar.py | 9 +- addons/base_calendar/base_calendar_view.xml | 153 ++++++++++---------- 2 files changed, 85 insertions(+), 77 deletions(-) diff --git a/addons/base_calendar/base_calendar.py b/addons/base_calendar/base_calendar.py index 4dffd8bcbf8..f91ded74685 100644 --- a/addons/base_calendar/base_calendar.py +++ b/addons/base_calendar/base_calendar.py @@ -333,10 +333,10 @@ class calendar_attendee(osv.osv): ('opt-participant', 'Optional Participation'), \ ('non-participant', 'For information Purpose')], 'Role', \ help='Participation role for the calendar user'), - 'state': fields.selection([('tentative', 'Tentative'), - ('needs-action', 'Needs Action'), - ('accepted', 'Accepted'), + 'state': fields.selection([('needs-action', 'Needs Action'), + ('tentative', 'Tentative'), ('declined', 'Declined'), + ('accepted', 'Accepted'), ('delegated', 'Delegated')], 'State', readonly=True, \ help="Status of the attendee's participation"), 'rsvp': fields.boolean('Required Reply?', @@ -1036,8 +1036,9 @@ class calendar_event(osv.osv): 'Show as', states={'done': [('readonly', True)]}), 'base_calendar_url': fields.char('Caldav URL', size=264), 'state': fields.selection([('tentative', 'Tentative'), + ('cancelled', 'Cancelled'), ('confirmed', 'Confirmed'), - ('cancelled', 'Cancelled')], 'State', readonly=True), + ], 'State', readonly=True), 'exdate': fields.text('Exception Date/Times', help="This property \ defines the list of date/time exceptions for a recurring calendar component."), 'exrule': fields.char('Exception Rule', size=352, help="Defines a \ diff --git a/addons/base_calendar/base_calendar_view.xml b/addons/base_calendar/base_calendar_view.xml index 8af1746b5e9..f24f206b107 100644 --- a/addons/base_calendar/base_calendar_view.xml +++ b/addons/base_calendar/base_calendar_view.xml @@ -8,59 +8,63 @@ calendar.attendee form - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + @@ -20,7 +22,7 @@
- +
@@ -37,7 +39,7 @@

- + From c47dc13048bf049c4f6084e473067fd2f60afab7 Mon Sep 17 00:00:00 2001 From: niv-openerp Date: Mon, 21 May 2012 12:02:04 +0200 Subject: [PATCH 225/263] [imp] modified rng of kanban view to add quick_create/create flags bzr revid: nicolas.vanhoren@openerp.com-20120521100204-maa76010h4ugz6oz --- openerp/addons/base/rng/view.rng | 2 ++ 1 file changed, 2 insertions(+) diff --git a/openerp/addons/base/rng/view.rng b/openerp/addons/base/rng/view.rng index e96c83f44bf..5991b57e529 100644 --- a/openerp/addons/base/rng/view.rng +++ b/openerp/addons/base/rng/view.rng @@ -206,6 +206,8 @@ grouping is selected in the search view --> + + From ddd8c6ef9609185c21d7af1f0896d235511b56d2 Mon Sep 17 00:00:00 2001 From: Xavier Morel Date: Mon, 21 May 2012 12:07:31 +0200 Subject: [PATCH 226/263] [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 da0fbecf5338eb24007446f21f21d3ac95f8b3e7 Mon Sep 17 00:00:00 2001 From: "Amit Patel (OpenERP)" Date: Mon, 21 May 2012 15:57:44 +0530 Subject: [PATCH 227/263] [IMP]:account_vouchar:improved domain for attrs. bzr revid: apa@tinyerp.com-20120521102744-6ygc243zu22gy81y --- addons/account_voucher/voucher_sales_purchase_view.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/account_voucher/voucher_sales_purchase_view.xml b/addons/account_voucher/voucher_sales_purchase_view.xml index 0b83097fecb..f9317190b23 100644 --- a/addons/account_voucher/voucher_sales_purchase_view.xml +++ b/addons/account_voucher/voucher_sales_purchase_view.xml @@ -83,7 +83,7 @@