pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[FIX] web: properly handles ESC in editable lists

Browse Source 
It is not really easy to handle discard operations.  We need to handle
the discard in editable lists, and in x2manys. This is not exactly the
same code, but most of this was done by moving the discard method from
the formcontroller to the basic controller.

With this commit, the user can now discard the changes for the current
record by pressing ESC.  If the record is new, it will remove it, if
not, it will ask for confirmation before.
This commit is contained in:
Géry Debongnie
2017-05-22 10:07:33 +02:00
parent a60ae43835
commit 3aad756d32
8 changed files with 153 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/web/static/src/js/fields/abstract_field.js
+3
View File
@@ -408,6 +408,9 @@ var AbstractField = Widget.extend({
ev.stopPropagation();
this.trigger_up('navigation_move', {direction: 'next_line'});
break;
case $.ui.keyCode.ESCAPE:
this.trigger_up('navigation_move', {direction: 'cancel'});
break;
case $.ui.keyCode.UP:
ev.stopPropagation();
this.trigger_up('navigation_move', {direction: 'up'});
addons/web/static/src/js/fields/relational_fields.js
+21 -1
View File
@@ -165,6 +165,13 @@ var FieldMany2One = AbstractField.extend({
focus: function (event) {
event.preventDefault(); // don't automatically select values on focus
},
close: function (event) {
// it is necessary to prevent ESC key from propagating to field
// root, to prevent unwanted discard operations.
if (event.which === $.ui.keyCode.ESCAPE) {
event.stopPropagation();
}
},
autoFocus: true,
html: true,
minLength: 0,
@@ -547,6 +554,7 @@ var FieldX2Many = AbstractField.extend({
tagName: 'div',
custom_events: _.extend({}, AbstractField.prototype.custom_events, {
add_record: '_onAddRecord',
discard_changes: '_onDiscardChanges',
edit_line: '_onEditLine',
field_changed: '_onFieldChanged',
kanban_record_delete: '_onDeleteRecord',
@@ -756,7 +764,7 @@ var FieldX2Many = AbstractField.extend({
this.renderer.commitChanges(recordID).then(function () { // TODO wrong as no mutex protection
var fieldNames = self.renderer.canBeSaved(recordID);
if (fieldNames.length) {
self.trigger_up('discard_x2m_changes', {
self.trigger_up('discard_changes', {
recordID: recordID,
onSuccess: def.resolve.bind(def),
onFailure: def.reject.bind(def),
@@ -798,6 +806,18 @@ var FieldX2Many = AbstractField.extend({
ids: [ev.data.id],
});
},
/**
* When the discard_change event go through this field, we can just decorate
* the data with the name of the field. The origin field ignore this
* information (it is a subfield in a o2m), and the controller will need to
* know which field needs to be handled.
*
* @private
* @param {OdooEvent} ev
*/
_onDiscardChanges: function (ev) {
ev.data.fieldName = this.name;
},
/**
* Called when the renderer asks to edit a line, in that case simply tells
* him back to toggle the mode of this row.
addons/web/static/src/js/views/basic/basic_controller.js
+26
View File
@@ -18,6 +18,7 @@ var _t = core._t;
var BasicController = AbstractController.extend(FieldManagerMixin, {
custom_events: _.extend({}, AbstractController.prototype.custom_events, FieldManagerMixin.custom_events, {
discard_changes: '_onDiscardChanges',
reload: '_onReload',
sidebar_data_asked: '_onSidebarDataAsked',
translate: '_onTranslate',
@@ -456,6 +457,31 @@ var BasicController = AbstractController.extend(FieldManagerMixin, {
// Handlers
//--------------------------------------------------------------------------
/**
* Called when a list element asks to discard the changes made to one of
* its rows. It can happen with a x2many (if we are in a form view) or with
* a list view.
*
* @private
* @param {OdooEvent} ev
*/
_onDiscardChanges: function (ev) {
var self = this;
ev.stopPropagation();
var recordID = ev.data.recordID;
this.discardChanges(recordID)
.done(function () {
if (self.model.isNew(recordID)) {
self._abandonRecord(recordID);
}
// TODO this will tell the renderer to rerender the widget that
// asked for the discard but will unfortunately lose the click
// made on another row if any
self._confirmChange(self.handle, [ev.data.fieldName], ev)
.always(ev.data.onSuccess);
})
.fail(ev.data.onFailure);
},
/**
* Forces to save directly the changes if the controller is in readonly,
* because in that case the changes come from widgets that are editable even
addons/web/static/src/js/views/form/form_controller.js
-27
View File
@@ -15,7 +15,6 @@ var FormController = BasicController.extend({
open_one2many_record: '_onOpenOne2ManyRecord',
bounce_edit: '_onBounceEdit',
button_clicked: '_onButtonClicked',
discard_x2m_changes: '_onDiscardX2MChanges',
open_record: '_onOpenRecord',
toggle_column_order: '_onToggleColumnOrder',
}),
@@ -376,32 +375,6 @@ var FormController = BasicController.extend({
_onDiscard: function () {
this.discardChanges();
},
/**
* Called when a x2m asks to discard the changes made to one of its row.
*
* @todo find a better way to handle this... this could also be used outside
* of form views
*
* @private
* @param {OdooEvent} ev
*/
_onDiscardX2MChanges: function (ev) {
var self = this;
ev.stopPropagation();
var recordID = ev.data.recordID;
this.discardChanges(recordID)
.done(function () {
if (self.model.isNew(recordID)) {
self._abandonRecord(recordID);
}
// TODO this will tell the renderer to rerender the widget that
// asked for the discard but will unfortunately lose the click
// made on another row if any
self._confirmChange(self.handle, [ev.target.name], ev)
.always(ev.data.onSuccess);
})
.fail(ev.data.onFailure);
},
/**
* Called when the user clicks on 'Duplicate Record' in the sidebar
*
addons/web/static/src/js/views/list/list_controller.js
+4 -1
View File
@@ -64,7 +64,10 @@ var ListController = BasicController.extend({
return $.when();
}
}
return this._super(recordID);
var self = this;
return this._super(recordID).then(function () {
self._updateButtons('readonly');
});
},
/**
* Calculate the active domain of the list view. This should be done only
addons/web/static/src/js/views/list/list_editable_renderer.js
+9 -2
View File
@@ -113,13 +113,15 @@ ListRenderer.include({
*/
removeLine: function (state, recordID) {
var rowIndex = _.findIndex(this.state.data, {id: recordID});
this.state = state;
if (rowIndex === -1) {
return;
}
if (rowIndex === this.currentRow) {
this.currentRow = null;
}
var $row = this.$('.o_data_row:nth(' + rowIndex + ')');
$row.remove();
this.state = state;
},
/**
* Updates the already rendered row associated to the given recordID so that
@@ -574,6 +576,11 @@ ListRenderer.include({
case 'next_line':
this._moveToNextLine();
break;
case 'cancel':
this.trigger_up('discard_changes', {
recordID: ev.target.dataPointID,
});
break;
}
},
/**
addons/web/static/tests/fields/relational_fields_tests.js
+68
View File
@@ -1814,6 +1814,74 @@ QUnit.module('relational_fields', {
form.destroy();
});
QUnit.test('editable o2m, pressing ESC discard current changes', function (assert) {
assert.expect(5);
var form = createView({
View: FormView,
model: 'partner',
data: this.data,
arch: '<form string="Partners">' +
'<field name="turtles">' +
'<tree editable="top">' +
'<field name="turtle_foo"/>' +
'</tree>' +
'</field>' +
'</form>',
res_id: 2,
mockRPC: function (route, args) {
assert.step(args.method);
return this._super.apply(this, arguments);
},
});
form.$buttons.find('.o_form_button_edit').click();
form.$('.o_field_x2many_list_row_add a').click();
assert.strictEqual(form.$('tr.o_data_row').length, 1,
"there should be one data row");
form.$('input[name="turtle_foo"]').trigger({type: 'keydown', which: $.ui.keyCode.ESCAPE});
assert.strictEqual(form.$('tr.o_data_row').length, 0,
"data row should have been discarded");
assert.verifySteps(['read', 'default_get']);
form.destroy();
});
QUnit.test('editable o2m with required field, pressing ESC discard current changes', function (assert) {
assert.expect(5);
this.data.turtle.fields.turtle_foo.required = true;
var form = createView({
View: FormView,
model: 'partner',
data: this.data,
arch: '<form string="Partners">' +
'<field name="turtles">' +
'<tree editable="top">' +
'<field name="turtle_foo"/>' +
'</tree>' +
'</field>' +
'</form>',
res_id: 2,
mockRPC: function (route, args) {
assert.step(args.method);
return this._super.apply(this, arguments);
},
});
form.$buttons.find('.o_form_button_edit').click();
form.$('.o_field_x2many_list_row_add a').click();
assert.strictEqual(form.$('tr.o_data_row').length, 1,
"there should be one data row");
form.$('input[name="turtle_foo"]').trigger({type: 'keydown', which: $.ui.keyCode.ESCAPE});
assert.strictEqual(form.$('tr.o_data_row').length, 0,
"data row should have been discarded");
assert.verifySteps(['read', 'default_get']);
form.destroy();
});
QUnit.test('onchange in a one2many', function (assert) {
assert.expect(1);
addons/web/static/tests/views/list_tests.js
+22
View File
@@ -2185,6 +2185,28 @@ QUnit.module('Views', {
list.destroy();
});
QUnit.test('pressing ESC discard the current line changes', function (assert) {
assert.expect(3);
var list = createView({
View: ListView,
model: 'foo',
data: this.data,
arch: '<tree editable="top"><field name="foo"/></tree>',
});
list.$buttons.find('.o_list_button_add').click();
list.$('input[name="foo"]').trigger({type: 'keydown', which: $.ui.keyCode.ESCAPE});
assert.strictEqual(list.$('tr.o_data_row').length, 4,
"should have 4 data row in list");
assert.strictEqual(list.$('tr.o_data_row.o_selected_row').length, 0,
"no rows should be selected");
assert.ok(!list.$buttons.find('.o_list_button_save').is(':visible'),
"should not have a visible save button");
list.destroy();
});
});
});