summaryrefslogtreecommitdiff
path: root/addons/web/static/src/js/views/view_dialogs.js
diff options
context:
space:
mode:
authorGéry Debongnie <ged@odoo.com>2017-11-07 10:53:04 +0100
committerGéry Debongnie <ged@odoo.com>2017-11-08 10:50:12 +0100
commit9e97ad8dce4525d6a132b8f8353b5c8fa87caba2 (patch)
tree9422f864b1fbd54684b428150aa282da31519db9 /addons/web/static/src/js/views/view_dialogs.js
parent324d4bfb562a1549f4895fd7d8925a3353edb704 (diff)
[FIX] web: prevent useless discard dialog from showing up
Here is a scenario that could cause an issue: - open a form view with a many2one - click on edit button - click on small external button for many2one. this opens a modal form view - click on save in the modal (without changing anything) - click on save in the main record - exit form view. this opens a discard dialog There were two issues here: - saving the modal dialog automatically marks the many2one field as changed. This was necessary to force reloading the data, because editing a sub value in the modal form view could have changed the display_name of the manyone field. However, this is not necessary when no change was done. - when saving a record, the _isDirty flag was reset to false only if an actual rpc was done. However, it may happen that the flag is set to dirty (for example, when modifying a value inside a many2one), but the main record has no changed fields. In this commit, we also remove the on_save handler in the formviewdialog. This is a small refactoring in a stable version, but no code currently use it, and I believe that it will make the code much easier to maintain (the previous code was really awkward), so I think that the tradeoff is acceptable.
Diffstat (limited to 'addons/web/static/src/js/views/view_dialogs.js')
-rw-r--r--addons/web/static/src/js/views/view_dialogs.js22
1 files changed, 7 insertions, 15 deletions
diff --git a/addons/web/static/src/js/views/view_dialogs.js b/addons/web/static/src/js/views/view_dialogs.js
index da3fc94f2ce..f24bc9341b8 100644
--- a/addons/web/static/src/js/views/view_dialogs.js
+++ b/addons/web/static/src/js/views/view_dialogs.js
@@ -81,9 +81,9 @@ var FormViewDialog = ViewDialog.extend({
* @param {Object} [options.fields_view] optional form fields_view
* @param {boolean} [options.readonly=false] only applicable when not in
* creation mode
- * @param {function} [options.on_save] callback to execute when clicking on
- * 'Save' (form view's 'saveRecord' by default)
- * @param {function} [options.on_saved] callback executed after on_save
+ * @param {function} [options.on_saved] callback executed after saving a
+ * record. It will be called with the record data, and a boolean which
+ * indicates if something was changed
* @param {BasicModel} [options.model] if given, it will be used instead of
* a new form view model
* @param {string} [options.recordID] if given, the model has to be given as
@@ -211,24 +211,16 @@ var FormViewDialog = ViewDialog.extend({
_save: function () {
var self = this;
- var def;
- if (this.options.on_save) {
- if (this.form_view.canBeSaved()) {
- return $.Deferred().reject();
- }
- def = this.options.on_save(this.form_view.model.get(this.form_view.handle));
- } else {
- def = this.form_view.saveRecord(this.form_view.handle, {
+ return this.form_view.saveRecord(this.form_view.handle, {
stayInEdit: true,
reload: false,
savePoint: this.shouldSaveLocally,
viewType: 'form',
- });
- }
- return $.when(def).then(function () {
+ }).then(function (changedFields) {
// record might have been changed by the save (e.g. if this was a new record, it has an
// id now), so don't re-use the copy obtained before the save
- self.on_saved(self.form_view.model.get(self.form_view.handle));
+ var record = self.form_view.model.get(self.form_view.handle);
+ self.on_saved(record, !!changedFields.length);
});
},
});