diff options
| author | Aaron Bohy <aab@odoo.com> | 2017-09-20 14:45:23 +0200 |
|---|---|---|
| committer | Géry Debongnie <ged@odoo.com> | 2017-09-20 17:07:04 +0200 |
| commit | 130c47bc0abee1ab193fb136bd1844dba8a693cd (patch) | |
| tree | bf26424613557729f0c507480e3e32aa91a57b9a /addons/web/static/src/js/views/basic | |
| parent | a5ca63c83beafd9a060ac58d3b4c6a9a987b28df (diff) | |
[FIX] web: several minor issues with editable list
- correctly update the pager when a record is added or removed
- destroy the widgets of the removed row when the user clicks on
'Cancel' when creating a new record
- ensure that the list always contains 4 rows (before this rev.,
in list views with less than 4 records, if the user created a
new record, then clicked on 'Discard', there were only 3 rows
left
- properly destroy field widgets when removed from the DOM
Note that the change of parent.parentID to parent.static is not a
bug fix, but it's better to use the key that indicates the type of
list element, instead of implying it from other attributes.
Diffstat (limited to 'addons/web/static/src/js/views/basic')
| -rw-r--r-- | addons/web/static/src/js/views/basic/basic_model.js | 3 | ||||
| -rw-r--r-- | addons/web/static/src/js/views/basic/basic_renderer.js | 18 |
2 files changed, 11 insertions, 10 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 cf5a18488a6..103c0d4c5d2 100644 --- a/addons/web/static/src/js/views/basic/basic_model.js +++ b/addons/web/static/src/js/views/basic/basic_model.js @@ -768,7 +768,7 @@ var BasicModel = AbstractModel.extend({ removeLine: function (elementID) { var record = this.localData[elementID]; var parent = this.localData[record.parentID]; - if (parent.parentID) { + if (parent.static) { // x2Many case: the new record has been stored in _changes, as a // command so we remove the command(s) related to that record parent._changes = _.filter(parent._changes, function (change) { @@ -777,6 +777,7 @@ var BasicModel = AbstractModel.extend({ } else { // main list view case: the new record is in data parent.data = _.without(parent.data, elementID); + parent.count--; } }, /** diff --git a/addons/web/static/src/js/views/basic/basic_renderer.js b/addons/web/static/src/js/views/basic/basic_renderer.js index e040a5fa7f0..09b264be0b5 100644 --- a/addons/web/static/src/js/views/basic/basic_renderer.js +++ b/addons/web/static/src/js/views/basic/basic_renderer.js @@ -273,18 +273,18 @@ var BasicRenderer = AbstractRenderer.extend({ * from internal referencing. * * @private - * @param {Object} record + * @param {string} recordID id of the local resource * @param {AbstractField} widget * @returns {integer} the index of the removed widget */ - _destroyFieldWidget: function (record, widget) { - var recordWidgets = this.allFieldWidgets[record.id]; + _destroyFieldWidget: function (recordID, widget) { + var recordWidgets = this.allFieldWidgets[recordID]; var index = recordWidgets.indexOf(widget); if (index >= 0) { recordWidgets.splice(index, 1); } - this._unregisterModifiersElement(widget.__node, record, widget); - widget.$el.destroy(); + this._unregisterModifiersElement(widget.__node, recordID, widget); + widget.destroy(); return index; }, /** @@ -541,7 +541,7 @@ var BasicRenderer = AbstractRenderer.extend({ widget.$el.replaceWith(newWidget.$el); // Destroy the old widget and position the new one at the old one's - var oldIndex = this._destroyFieldWidget(record, widget); + var oldIndex = this._destroyFieldWidget(record.id, widget); var recordWidgets = this.allFieldWidgets[record.id]; recordWidgets.splice(oldIndex, 0, newWidget); recordWidgets.pop(); @@ -553,13 +553,13 @@ var BasicRenderer = AbstractRenderer.extend({ * node and record. * * @param {Object} node - * @param {Object} record + * @param {string} recordID id of the local resource * @param {jQuery|AbstractField} element */ - _unregisterModifiersElement: function (node, record, element) { + _unregisterModifiersElement: function (node, recordID, element) { var modifiersData = this._getModifiersData(node); if (modifiersData) { - var elements = modifiersData.elementsByRecord[record.id]; + var elements = modifiersData.elementsByRecord[recordID]; var index = _.findIndex(elements, function (oldElement) { return oldElement.widget === element || oldElement.$el[0] === element[0]; |
