diff options
| author | Christophe Simonis <chs@odoo.com> | 2017-01-10 13:50:48 +0100 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2017-01-10 13:50:48 +0100 |
| commit | 557feb950cb74656c92e59a62847c9e414c9b41f (patch) | |
| tree | 8b95618acf9659f7f5a6bc6d36e5b5090ce1ef68 /addons/web/static/src | |
| parent | 63f732b9a10b9f13e7e5538a84a1d61dc6fb3ad8 (diff) | |
| parent | 482fd04167410885264d5903ea621682f5f917db (diff) | |
[MERGE] forward port branch 10.0 up to 482fd041674
Diffstat (limited to 'addons/web/static/src')
| -rw-r--r-- | addons/web/static/src/js/views/list_view_editable.js | 3 | ||||
| -rw-r--r-- | addons/web/static/src/js/views/search_view.js | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/addons/web/static/src/js/views/list_view_editable.js b/addons/web/static/src/js/views/list_view_editable.js index 3f5d39e60e1..ef9bf1a6062 100644 --- a/addons/web/static/src/js/views/list_view_editable.js +++ b/addons/web/static/src/js/views/list_view_editable.js @@ -641,7 +641,8 @@ ListView.include(/** @lends instance.web.ListView# */{ if (saveInfo.created) { return self.start_edition(); } - var record = self.records[next_record](saveInfo.record); + var options = { wraparound: !self.is_action_enabled('create') }; + var record = self.records[next_record](saveInfo.record, options); if (record === undefined) { return self.start_edition(); } diff --git a/addons/web/static/src/js/views/search_view.js b/addons/web/static/src/js/views/search_view.js index 9f985fc3f49..65dbb4557e7 100644 --- a/addons/web/static/src/js/views/search_view.js +++ b/addons/web/static/src/js/views/search_view.js @@ -466,7 +466,7 @@ var SearchView = View.extend({ */ select_completion: function (e, ui) { e.preventDefault(); - if(ui.item.facet.values && ui.item.facet.values.length && String(ui.item.facet.values[0].value).trim() !== "") { + if(ui.item.facet && ui.item.facet.values && ui.item.facet.values.length && String(ui.item.facet.values[0].value).trim() !== "") { this.query.add(ui.item.facet); } else { this.query.trigger('add'); |