', {class: 'o_add_record_row'})
+ .data('groupID', group.id)
+ .append($td);
+ $groupBody.append($tr.prepend($('| ').html(' ')));
+ }
+ return result;
+ },
/**
* The renderer needs to support reordering lines. This is only active in
* edit mode. The handleField attribute is set when there is a sequence
@@ -618,8 +776,9 @@ ListRenderer.include({
_renderView: function () {
var self = this;
this.currentRow = null;
+ this.allRecordsIds = null;
return this._super.apply(this, arguments).then(function () {
- if (self._isEditable()) {
+ if (self.editable) {
self.$('table').addClass('o_editable_list');
}
});
@@ -635,7 +794,7 @@ ListRenderer.include({
var self = this;
var movedRecordID = ui.item.data('id');
var rows = this.state.data;
- var row = _.findWhere(rows, {id: movedRecordID});
+ var row = self._getRecord(movedRecordID);
var index0 = rows.indexOf(row);
var index1 = ui.item.index();
var lower = Math.min(index0, index1);
@@ -714,7 +873,8 @@ ListRenderer.include({
// Select the row then activate the widget in the correct cell
var self = this;
return this._selectRow(rowIndex).then(function () {
- var record = self.state.data[rowIndex];
+ var recordID = self._getRecordID(rowIndex);
+ var record = self._getRecord(recordID);
if (fieldIndex >= (self.allFieldWidgets[record.id] || []).length) {
return Promise.reject();
}
@@ -746,11 +906,11 @@ ListRenderer.include({
if (rowIndex === this.currentRow) {
return Promise.resolve();
}
-
+ var recordId = this._getRecordID(rowIndex);
// To select a row, the currently selected one must be unselected first
var self = this;
return this.unselectRow().then(function () {
- if (self.state.data.length <= rowIndex) {
+ if (!recordId) {
// The row to selected doesn't exist anymore (probably because
// an onchange triggered when unselecting the previous one
// removes rows)
@@ -759,7 +919,7 @@ ListRenderer.include({
// Notify the controller we want to make a record editable
return new Promise(function (resolve) {
self.trigger_up('edit_line', {
- index: rowIndex,
+ recordId: recordId,
onSuccess: resolve,
});
});
@@ -770,10 +930,31 @@ ListRenderer.include({
// Handlers
//--------------------------------------------------------------------------
+ /**
+ * This method is called when we click on the 'Add a line' button in a groupby
+ * list view.
+ *
+ * @param {MouseEvent} ev
+ */
+ _onAddRecordToGroup: function (ev) {
+ ev.preventDefault();
+ // we don't want the click to cause other effects, such as unselecting
+ // the row that we are creating, because it counts as a click on a tr
+ ev.stopPropagation();
+
+ var self = this;
+ var groupId = $(ev.target).data('groupID');
+ this.unselectRow().then(function () {
+ self.trigger_up('add_record', {
+ groupId: groupId,
+ });
+ });
+ },
/**
* This method is called when we click on the 'Add a line' button in a sub
* list such as a one2many in a form view.
*
+ * @private
* @param {MouseEvent} ev
*/
_onAddRecord: function (ev) {
@@ -799,12 +980,12 @@ ListRenderer.include({
_onCellClick: function (event) {
// The special_click property explicitely allow events to bubble all
// the way up to bootstrap's level rather than being stopped earlier.
- if (!this._isEditable() || $(event.target).prop('special_click')) {
+ if (!this.editable || $(event.target).prop('special_click')) {
return;
}
var $td = $(event.currentTarget);
var $tr = $td.parent();
- var rowIndex = this.$('.o_data_row').index($tr);
+ var rowIndex = $tr.prop('rowIndex') - 1;
var fieldIndex = Math.max($tr.find('.o_data_cell').not('.o_list_button').index($td), 0);
this._selectCell(rowIndex, fieldIndex, {event: event});
},
@@ -822,11 +1003,11 @@ ListRenderer.include({
_onFooterClick: function () {
this.unselectRow();
},
- /**
- * @param {KeyDownEvent} e
- * @private
- */
- _onKeyDownAddRecord: function(e) {
+ /**
+ * @private
+ * @param {KeyDownEvent} e
+ */
+ _onKeyDownAddRecord: function (e) {
switch(e.keyCode) {
case $.ui.keyCode.ENTER:
e.stopPropagation();
@@ -842,8 +1023,8 @@ ListRenderer.include({
* @returns {Class} Widget returns last widget
*/
_getLastWidget: function () {
- var record = this.state.data[this.currentRow];
- var recordWidgets = this.allFieldWidgets[record.id];
+ var recordID = this._getRecordID(this.currentRow);
+ var recordWidgets = this.allFieldWidgets[recordID];
var lastWidget = _.chain(recordWidgets).filter(function (widget) {
var isLast =
widget.$el.is(':visible') &&
@@ -856,7 +1037,6 @@ ListRenderer.include({
}).last().value();
return lastWidget;
},
-
/**
* Handles the keyboard navigation according to events triggered by field
* widgets.
@@ -885,23 +1065,10 @@ ListRenderer.include({
}
break;
case 'next':
- // When navigating with the keyboard, we want to get out of the list editable if the
- // entire line is left unmodified and we are on the next line.
var column = this.columns[this.currentFieldIndex];
var lastWidget = this._getLastWidget();
if (column.attrs.name === lastWidget.name) {
- if (this.currentRow + 1 < this.state.data.length) {
- this._selectCell(this.currentRow+1, 0, {wrap:false})
- .guardedCatch(this._moveToNextLine.bind(this));
- } else {
- var currentRowData = this.state.data[this.currentRow];
- if (currentRowData.isDirty(currentRowData.id)) {
- this._moveToNextLine();
- }
- else {
- this.trigger_up('activate_next_widget');
- }
- }
+ this._moveToNextLine();
} else {
if (this.currentFieldIndex + 1 < this.columns.length) {
this._selectCell(this.currentRow, this.currentFieldIndex + 1, {wrap: false})
@@ -912,7 +1079,7 @@ ListRenderer.include({
}
break;
case 'next_line':
- this._moveToNextLine();
+ this._moveToNextLine({forceCreate: true});
break;
case 'cancel':
// stop the original event (typically an ESCAPE keydown), to
@@ -922,7 +1089,7 @@ ListRenderer.include({
this.trigger_up('discard_changes', {
recordID: ev.target.dataPointID,
onSuccess: function () {
- self.$('.o_field_x2many_list_row_add a:first').focus();
+ self.$('.o_field_x2many_list_row_add a:first').focus(); // FIXME
}
});
break;
@@ -955,7 +1122,7 @@ ListRenderer.include({
* @private
*/
_onRowClicked: function () {
- if (!this._isEditable()) {
+ if (!this.editable) {
this._super.apply(this, arguments);
}
},
diff --git a/addons/web/static/src/js/views/list/list_renderer.js b/addons/web/static/src/js/views/list/list_renderer.js
index 760ab9ed7a8..e6462d99609 100644
--- a/addons/web/static/src/js/views/list/list_renderer.js
+++ b/addons/web/static/src/js/views/list/list_renderer.js
@@ -471,6 +471,27 @@ var ListRenderer = BasicRenderer.extend({
.append($th)
.append($cells);
},
+ /**
+ * Render the content of a given opened group.
+ *
+ * @private
+ * @param {Object} group
+ * @param {integer} groupLevel the nesting level (0 for root groups)
+ * @returns {jQueryElement} a |