From d86eb9e1a0a59f1d5289d9b8707eaa4bf95dc215 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?G=C3=A9ry=20Debongnie?= Date: Wed, 4 Apr 2018 12:05:08 +0200 Subject: [PATCH] [FIX] web,doc: fix errors that prevented doc from building --- addons/web/static/src/js/chrome/search_view.js | 13 +++++++------ doc/reference/data.rst | 4 ++-- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/addons/web/static/src/js/chrome/search_view.js b/addons/web/static/src/js/chrome/search_view.js index 302336deeb2..8ec1eb9ec71 100644 --- a/addons/web/static/src/js/chrome/search_view.js +++ b/addons/web/static/src/js/chrome/search_view.js @@ -616,11 +616,12 @@ var SearchView = Widget.extend({ * @todo: the way it is done could be improved, but the actual state of the * searchview doesn't allow to do much better. - * @param {Array[Object]} list of filters to add, described by objects with - * keys domain (the domain as an Array), and help (the text to display in - * the facet) - * @param {Array[Object]} list of filters to remove (previously added ones) - * @returns {Array[Object]} list of added filters (to pass as filtersToRemove + * @param {Array} newFilters list of filters to add, described by + * objects with keys domain (the domain as an Array), and help (the text + * to display in the facet) + * @param {Array} filtersToRemove list of filters to remove + * (previously added ones) + * @returns {Array} list of added filters (to pass as filtersToRemove * for a further call to this function) */ updateFilters: function (newFilters, filtersToRemove) { @@ -643,7 +644,7 @@ var SearchView = Widget.extend({ this.query.trigger('reset'); - return addedFilters + return addedFilters; }, //-------------------------------------------------------------------------- diff --git a/doc/reference/data.rst b/doc/reference/data.rst index fd597fcb4a5..2165a490dd0 100644 --- a/doc/reference/data.rst +++ b/doc/reference/data.rst @@ -243,14 +243,14 @@ For this case, data files can also use csv_, this is often the case for Here's the first lines of the data file defining US states ``res.country.state.csv`` -.. literalinclude:: ../../odoo/addons/base/res/res.country.state.csv +.. literalinclude:: ../../odoo/addons/base/data/res.country.state.csv :language: text :lines: 1-15 rendered in a more readable format: .. csv-table:: - :file: ../../odoo/addons/base/res/res.country.state.csv + :file: ../../odoo/addons/base/data/res.country.state.csv :header-rows: 1 :class: table-striped table-hover table-condensed