summaryrefslogtreecommitdiff
path: root/addons/web/static/src/js/views
diff options
context:
space:
mode:
authorAaron Bohy <aab@odoo.com>2019-05-08 09:58:42 +0000
committerAaron Bohy <aab@odoo.com>2019-07-18 09:48:07 +0000
commite0c7c8e288178b0621d0265f61a3c6cc229fe3d9 (patch)
tree06ee46fa477c0ebaa7edddafe115157a18b71d06 /addons/web/static/src/js/views
parentf9565d63346504b29b6c401ad03e4de27b309203 (diff)
[FIX] web: execute action from new record and go back
Let's assume a form view with a readonly many2one field with a default value. When creating a new record, the user can click on the many2one value, which should open the related record in a form view (stacked in the breadcrumbs). Before this rev., this didn't work: we actually came back to the previous view/action in the breadcrumbs, when trying to open the related record. closes odoo/odoo#33172 Signed-off-by: VincentSchippefilt <VincentSchippefilt@users.noreply.github.com>
Diffstat (limited to 'addons/web/static/src/js/views')
-rw-r--r--addons/web/static/src/js/views/abstract_controller.js10
-rw-r--r--addons/web/static/src/js/views/basic/basic_controller.js4
-rw-r--r--addons/web/static/src/js/views/form/form_controller.js11
3 files changed, 18 insertions, 7 deletions
diff --git a/addons/web/static/src/js/views/abstract_controller.js b/addons/web/static/src/js/views/abstract_controller.js
index 607f49c8031..63d59d153fd 100644
--- a/addons/web/static/src/js/views/abstract_controller.js
+++ b/addons/web/static/src/js/views/abstract_controller.js
@@ -122,8 +122,11 @@ var AbstractController = mvc.Controller.extend(ActionMixin, {
* @override
*/
canBeRemoved: function () {
- // AAB: get rid of this option when on_hashchange mechanism is improved
- return this.discardChanges(undefined, { readonlyIfRealDiscard: true });
+ // AAB: get rid of 'readonlyIfRealDiscard' option when on_hashchange mechanism is improved
+ return this.discardChanges(undefined, {
+ noAbandon: true,
+ readonlyIfRealDiscard: true,
+ });
},
/**
* Discards the changes made on the record associated to the given ID, or
@@ -137,9 +140,10 @@ var AbstractController = mvc.Controller.extend(ActionMixin, {
*
* @param {string} [recordID]
* if not given, we consider all the changes made by the controller
+ * @param {Object} [options]
* @returns {Promise} resolved if properly discarded, rejected otherwise
*/
- discardChanges: function (recordID) {
+ discardChanges: function (recordID, options) {
return Promise.resolve();
},
/**
diff --git a/addons/web/static/src/js/views/basic/basic_controller.js b/addons/web/static/src/js/views/basic/basic_controller.js
index 064f7b84a52..9e9e7559ede 100644
--- a/addons/web/static/src/js/views/basic/basic_controller.js
+++ b/addons/web/static/src/js/views/basic/basic_controller.js
@@ -373,14 +373,16 @@ var BasicController = AbstractController.extend(FieldManagerMixin, {
* the new record to be in edit mode too, but the view manager calls
* this function as the URL changes...) @todo get rid of this when
* the webclient/action_manager's hashchange mechanism is improved.
+ * @param {boolean} [options.noAbandon=false]
* @returns {Promise}
*/
_discardChanges: function (recordID, options) {
var self = this;
recordID = recordID || this.handle;
+ options = options || {};
return this.canBeDiscarded(recordID)
.then(function (needDiscard) {
- if (options && options.readonlyIfRealDiscard && !needDiscard) {
+ if (options.noAbandon || (options.readonlyIfRealDiscard && !needDiscard)) {
return;
}
self.model.discardChanges(recordID);
diff --git a/addons/web/static/src/js/views/form/form_controller.js b/addons/web/static/src/js/views/form/form_controller.js
index a351c8fa04f..9db594b60db 100644
--- a/addons/web/static/src/js/views/form/form_controller.js
+++ b/addons/web/static/src/js/views/form/form_controller.js
@@ -50,13 +50,18 @@ var FormController = BasicController.extend({
this.autofocus();
},
/**
- * Force mode back to readonly. Whenever we leave a form view, it is saved,
- * and should no longer be in edit mode.
+ * This hook is called when a form view is restored (by clicking on the
+ * breadcrumbs). In general, we force mode back to readonly, because
+ * whenever we leave a form view by stacking another action on the top of
+ * it, it is saved, and should no longer be in edit mode. However, there is
+ * a special case for new records for which we still want to be in 'edit'
+ * as no record has been created (changes have been discarded before
+ * leaving).
*
* @override
*/
willRestore: function () {
- this.mode = 'readonly';
+ this.mode = this.model.isNew(this.handle) ? 'edit' : 'readonly';
},
//--------------------------------------------------------------------------