summaryrefslogtreecommitdiff
path: root/addons/web/static/src
diff options
context:
space:
mode:
authorChristophe Simonis <chs@odoo.com>2015-08-24 18:19:19 +0200
committerChristophe Simonis <chs@odoo.com>2015-08-24 18:19:19 +0200
commit88c0ce0692ccf3b1302e15c4ebe34dbf2040be40 (patch)
tree5bb1749f69f96df22a92a747052dc2965e83430e /addons/web/static/src
parent878c3c9291ad69b530d24227cb25b38dbf10229b (diff)
parente16d495d8965522d90ddf5d5da234b1650a695f9 (diff)
[MERGE] forward port of branch saas-6 up to e16d495
Diffstat (limited to 'addons/web/static/src')
-rw-r--r--addons/web/static/src/js/views/list_view.js1
-rw-r--r--addons/web/static/src/js/views/search_view.js2
2 files changed, 2 insertions, 1 deletions
diff --git a/addons/web/static/src/js/views/list_view.js b/addons/web/static/src/js/views/list_view.js
index 63940726fca..34a483f8aa9 100644
--- a/addons/web/static/src/js/views/list_view.js
+++ b/addons/web/static/src/js/views/list_view.js
@@ -128,6 +128,7 @@ var ListView = View.extend( /** @lends instance.web.ListView# */ {
// the view's number of records per page (|| section)
this._limit = (this.options.limit ||
this.defaults.limit ||
+ parseInt(this.fields_view.arch.attrs.limit, 10) ||
(this.getParent().action || {}).limit ||
80);
},
diff --git a/addons/web/static/src/js/views/search_view.js b/addons/web/static/src/js/views/search_view.js
index cd0735d24ed..dba0f8045fa 100644
--- a/addons/web/static/src/js/views/search_view.js
+++ b/addons/web/static/src/js/views/search_view.js
@@ -423,7 +423,7 @@ var SearchView = Widget.extend(/** @lends instance.web.SearchView# */{
if (this.$buttons) {
var fields_def = new Model(this.dataset.model).call('fields_get', {
- context: this.dataset.context
+ context: this.dataset.get_context()
});
this.groupby_menu = new GroupByMenu(this, this.groupbys, fields_def);