summaryrefslogtreecommitdiff
path: root/addons/web/static/src
diff options
context:
space:
mode:
authorMartin Geubelle <mge@odoo.com>2017-04-28 10:25:53 +0200
committerMartin Geubelle <mge@odoo.com>2017-05-04 11:58:26 +0200
commit4a648c227ab0142019e2ee6336ae23a8a11a51b0 (patch)
tree35256c4e3827af92ca7c2f9ac6ea97a787a7129d /addons/web/static/src
parentb84137c67f181b6324bf1b90fd828ef4b40a41ea (diff)
[FIX] web: Kanban: load more records in column
The method `load_more` has been wrongly removed from the Kanban model.
Diffstat (limited to 'addons/web/static/src')
-rw-r--r--addons/web/static/src/js/views/basic/basic_model.js20
-rw-r--r--addons/web/static/src/js/views/kanban/kanban_controller.js10
-rw-r--r--addons/web/static/src/js/views/kanban/kanban_model.js13
3 files changed, 35 insertions, 8 deletions
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 fd47e931317..ef93028eeba 100644
--- a/addons/web/static/src/js/views/basic/basic_model.js
+++ b/addons/web/static/src/js/views/basic/basic_model.js
@@ -32,6 +32,7 @@ odoo.define('web.BasicModel', function (require) {
* groupedBy: {string[]},
* id: {integer},
* isOpen: {boolean},
+ * loadMoreOffset: {integer},
* limit: {integer},
* model: {string,
* offset: {integer},
@@ -618,6 +619,12 @@ var BasicModel = AbstractModel.extend({
if (options.offset !== undefined) {
this._setOffset(element.id, options.offset);
}
+ if (options.loadMoreOffset !== undefined) {
+ element.loadMoreOffset = options.loadMoreOffset;
+ } else {
+ // reset if not specified
+ element.loadMoreOffset = 0;
+ }
if (options.currentId !== undefined) {
element.res_id = options.currentId;
}
@@ -2086,6 +2093,7 @@ var BasicModel = AbstractModel.extend({
id: _.uniqueId(params.modelName + '_'),
isOpen: params.isOpen,
limit: type === 'record' ? 1 : params.limit,
+ loadMoreOffset: 0,
model: params.modelName,
offset: params.offset || (type === 'record' ? _.indexOf(res_ids, res_id) : 0),
openGroupByDefault: params.openGroupByDefault,
@@ -2636,11 +2644,12 @@ var BasicModel = AbstractModel.extend({
context: list.context,
domain: list.domain || [],
limit: list.limit,
- offset: list.offset,
+ offset: list.loadMoreOffset + list.offset,
orderBy: list.orderedBy,
})
.then(function (result) {
list.count = result.length;
+ var ids = _.pluck(result.records, 'id');
var data = _.map(result.records, function (record) {
var dataPoint = self._makeDataPoint({
data: record,
@@ -2655,8 +2664,13 @@ var BasicModel = AbstractModel.extend({
self._parseServerData(fieldNames, dataPoint.fields, dataPoint.data);
return dataPoint.id;
});
- list.data = data;
- list.res_ids = _.pluck(result.records, 'id');
+ if (list.loadMoreOffset) {
+ list.data = list.data.concat(data);
+ list.res_ids = list.res_ids.concat(ids);
+ } else {
+ list.data = data;
+ list.res_ids = ids;
+ }
return list;
});
},
diff --git a/addons/web/static/src/js/views/kanban/kanban_controller.js b/addons/web/static/src/js/views/kanban/kanban_controller.js
index cbe31e5938f..cce5402e4e5 100644
--- a/addons/web/static/src/js/views/kanban/kanban_controller.js
+++ b/addons/web/static/src/js/views/kanban/kanban_controller.js
@@ -97,7 +97,7 @@ var KanbanController = BasicController.extend({
* The column quick create should be displayed in kanban iff grouped by an
* m2o field and group_create action enabled.
*
- * @returns {Boolean}
+ * @returns {boolean}
*/
_isCreateColumnEnabled: function () {
var groupCreate = this.is_action_enabled('group_create');
@@ -131,10 +131,10 @@ var KanbanController = BasicController.extend({
_updateButtons: function () {
if (this.$buttons) {
var data = this.model.get(this.handle, {raw: true});
- var create_muted = data.count === 0 && this.createColumnEnabled;
+ var createMuted = data.count === 0 && this.createColumnEnabled;
this.$buttons.find('.o-kanban-button-new')
- .toggleClass('btn-primary', !create_muted)
- .toggleClass('btn-default', create_muted);
+ .toggleClass('btn-primary', !createMuted)
+ .toggleClass('btn-default', createMuted);
}
},
/**
@@ -236,7 +236,7 @@ var KanbanController = BasicController.extend({
_onLoadMore: function (event) {
var self = this;
var column = event.target;
- this.model.load_more(column.db_id).then(function (db_id) {
+ this.model.loadMore(column.db_id).then(function (db_id) {
var data = self.model.get(db_id);
self.renderer.updateColumn(db_id, data);
});
diff --git a/addons/web/static/src/js/views/kanban/kanban_model.js b/addons/web/static/src/js/views/kanban/kanban_model.js
index 1e0fe55736c..9e5e0fc1267 100644
--- a/addons/web/static/src/js/views/kanban/kanban_model.js
+++ b/addons/web/static/src/js/views/kanban/kanban_model.js
@@ -90,6 +90,19 @@ var KanbanModel = BasicModel.extend({
return this._super(params);
},
/**
+ * Load more records in a group.
+ *
+ * @param {string} groupID localID of the group
+ * @returns {Deferred<string>} resolves to the localID of the group
+ */
+ loadMore: function (groupID) {
+ var group = this.localData[groupID];
+ var offset = group.loadMoreOffset + group.limit;
+ return this.reload(group.id, {
+ loadMoreOffset: offset,
+ });
+ },
+ /**
* Moves a record from a group to another.
*
* @param {string} recordID localID of the record