summaryrefslogtreecommitdiff
path: root/addons/web/static/src/js/views/basic
diff options
context:
space:
mode:
Diffstat (limited to 'addons/web/static/src/js/views/basic')
-rw-r--r--addons/web/static/src/js/views/basic/basic_controller.js76
-rw-r--r--addons/web/static/src/js/views/basic/basic_model.js26
2 files changed, 69 insertions, 33 deletions
diff --git a/addons/web/static/src/js/views/basic/basic_controller.js b/addons/web/static/src/js/views/basic/basic_controller.js
index 19d2fd57892..064f7b84a52 100644
--- a/addons/web/static/src/js/views/basic/basic_controller.js
+++ b/addons/web/static/src/js/views/basic/basic_controller.js
@@ -148,25 +148,28 @@ var BasicController = AbstractController.extend(FieldManagerMixin, {
*/
renderPager: function ($node, options) {
var self = this;
- var data = this.model.get(this.handle, {raw: true});
- this.pager = new Pager(this, data.count, data.offset + 1, data.limit, options);
+ var params = this._getPagerParams();
+ this.pager = new Pager(this, params.size, params.current_min, params.limit, options);
this.pager.on('pager_changed', this, function (newState) {
- var self = this;
this.pager.disable();
- data = this.model.get(this.handle, {raw: true});
+ var data = this.model.get(this.handle, {raw: true});
var limitChanged = (data.limit !== newState.limit);
- this.reload({limit: newState.limit, offset: newState.current_min - 1})
- .then(function () {
- // Reset the scroll position to the top on page changed only
- if (!limitChanged) {
- self.trigger_up('scrollTo', {top: 0});
- }
- })
- .then(this.pager.enable.bind(this.pager));
+ var reloadParams;
+ if (data.groupedBy && data.groupedBy.length) {
+ reloadParams = {groupsLimit: newState.limit, groupsOffset: newState.current_min - 1};
+ } else {
+ reloadParams = {limit: newState.limit, offset: newState.current_min - 1};
+ }
+ this.reload(reloadParams).then(function () {
+ // reset the scroll position to the top on page changed only
+ if (!limitChanged) {
+ self.trigger_up('scrollTo', {top: 0});
+ }
+ }).then(this.pager.enable.bind(this.pager));
});
- return this.pager.appendTo($node).then(function() {
- self._updatePager(); // to force proper visibility
+ return this.pager.appendTo($node).then(function () {
+ self._updatePager(); // to force proper visibility
});
},
/**
@@ -413,6 +416,22 @@ var BasicController = AbstractController.extend(FieldManagerMixin, {
});
},
/**
+ * Return the params (current_min, limit and size) to pass to the pager,
+ * according to the current state.
+ *
+ * @private
+ * @returns {Object}
+ */
+ _getPagerParams: function () {
+ var state = this.model.get(this.handle, {raw: true});
+ var isGrouped = state.groupedBy && state.groupedBy.length;
+ return {
+ current_min: (isGrouped ? state.groupsOffset : state.offset) + 1,
+ limit: isGrouped ? state.groupsLimit : state.limit,
+ size: isGrouped ? state.groupsCount : state.count,
+ };
+ },
+ /**
* Returns the new sidebar env
*
* @private
@@ -426,6 +445,16 @@ var BasicController = AbstractController.extend(FieldManagerMixin, {
};
},
/**
+ * Determine whether or not the pager must be displayed (probably depending
+ * on the current state). Controllers must override this to implement their
+ * own logic.
+ *
+ * @private
+ */
+ _isPagerVisible: function () {
+ return true;
+ },
+ /**
* Helper function to display a warning that some fields have an invalid
* value. This is used when a save operation cannot be completed.
*
@@ -533,23 +562,14 @@ var BasicController = AbstractController.extend(FieldManagerMixin, {
}
},
/**
- * Helper method, to make sure the information displayed by the pager is up
- * to date.
+ * Update the pager with the current state.
+ *
+ * @private
*/
_updatePager: function () {
if (this.pager) {
- var data = this.model.get(this.handle, {raw: true});
- this.pager.updateState({
- current_min: data.offset + 1,
- size: data.count,
- });
- var isRecord = data.type === 'record';
- var hasData = !!data.count;
- var isGrouped = data.groupedBy ? !!data.groupedBy.length : false;
- var isNew = this.model.isNew(this.handle);
- var isPagerVisible = isRecord ? !isNew : (hasData && !isGrouped);
-
- this.pager.do_toggle(isPagerVisible);
+ this.pager.updateState(this._getPagerParams());
+ this.pager.do_toggle(this._isPagerVisible());
}
},
diff --git a/addons/web/static/src/js/views/basic/basic_model.js b/addons/web/static/src/js/views/basic/basic_model.js
index 35435a3e500..d07ec61abdd 100644
--- a/addons/web/static/src/js/views/basic/basic_model.js
+++ b/addons/web/static/src/js/views/basic/basic_model.js
@@ -88,7 +88,6 @@ var concurrency = require('web.concurrency');
var Context = require('web.Context');
var core = require('web.core');
var Domain = require('web.Domain');
-var fieldUtils = require('web.field_utils');
var session = require('web.session');
var utils = require('web.utils');
var viewUtils = require('web.viewUtils');
@@ -639,6 +638,9 @@ var BasicModel = AbstractModel.extend({
getDomain: element.getDomain,
getFieldNames: element.getFieldNames,
groupedBy: element.groupedBy,
+ groupsCount: element.groupsCount,
+ groupsLimit: element.groupsLimit,
+ groupsOffset: element.groupsOffset,
id: element.id,
isDirty: element.isDirty,
isOpen: element.isOpen,
@@ -3732,6 +3734,9 @@ var BasicModel = AbstractModel.extend({
fields: fields,
fieldsInfo: params.fieldsInfo,
groupedBy: params.groupedBy || [],
+ groupsCount: 0,
+ groupsLimit: type === 'list' && params.groupsLimit || null,
+ groupsOffset: 0,
id: _.uniqueId(params.modelName + '_'),
isOpen: params.isOpen,
limit: type === 'record' ? 1 : params.limit,
@@ -4245,20 +4250,25 @@ var BasicModel = AbstractModel.extend({
var groupByField = list.groupedBy[0];
var rawGroupBy = groupByField.split(':')[0];
var fields = _.uniq(list.getFieldNames().concat(rawGroupBy));
- var orderedBy = _.filter(list.orderedBy, function(order){
+ var orderedBy = _.filter(list.orderedBy, function (order) {
return order.name === rawGroupBy || list.fields[order.name].group_operator !== undefined;
});
+ var openGroupsLimit = list.groupsLimit || self.OPEN_GROUP_LIMIT;
return this._rpc({
model: list.model,
- method: 'read_group',
+ method: 'web_read_group',
fields: fields,
domain: list.domain,
context: list.context,
groupBy: list.groupedBy,
+ limit: list.groupsLimit,
+ offset: list.groupsOffset,
orderBy: orderedBy,
lazy: true,
})
- .then(function (groups) {
+ .then(function (result) {
+ var groups = result.groups;
+ list.groupsCount = result.length;
var previousGroups = _.map(list.data, function (groupID) {
return self.localData[groupID];
});
@@ -4321,7 +4331,7 @@ var BasicModel = AbstractModel.extend({
// form view) are reloaded
newGroup.limit = oldGroup.limit + oldGroup.loadMoreOffset;
self.localData[newGroup.id] = newGroup;
- } else if (!newGroup.openGroupByDefault || openGroupCount >= self.OPEN_GROUP_LIMIT) {
+ } else if (!newGroup.openGroupByDefault || openGroupCount >= openGroupsLimit) {
newGroup.isOpen = false;
} else if ('__fold' in group) {
newGroup.isOpen = !group.__fold;
@@ -4486,6 +4496,12 @@ var BasicModel = AbstractModel.extend({
if (options.offset !== undefined) {
this._setOffset(element.id, options.offset);
}
+ if (options.groupsLimit !== undefined) {
+ element.groupsLimit = options.groupsLimit;
+ }
+ if (options.groupsOffset !== undefined) {
+ element.groupsOffset = options.groupsOffset;
+ }
if (options.loadMoreOffset !== undefined) {
element.loadMoreOffset = options.loadMoreOffset;
} else {
generated by cgit v1.2.3 (git 2.25.1) at 2026-10-24 02:15:59 +0000