summaryrefslogtreecommitdiff
path: root/addons/web/static/src/js/views/basic/basic_controller.js
diff options
context:
space:
mode:
authorChristophe Simonis <chs@odoo.com>2018-04-16 19:50:50 +0200
committerChristophe Simonis <chs@odoo.com>2018-04-16 19:50:50 +0200
commit74033eb007749c88b84ea883b006a5877355306e (patch)
tree8f8b6cb22cc2bf6046ba04e388ea29855a33c597 /addons/web/static/src/js/views/basic/basic_controller.js
parent71cdefd9f41881d9720433d5fc7732759098f9a4 (diff)
parent90f8f17fb4fc795c2c12d68d21900e81f3d7a223 (diff)
[MERGE] forward port branch saas-11.2 up to 90f8f17fb4f
Diffstat (limited to 'addons/web/static/src/js/views/basic/basic_controller.js')
-rw-r--r--addons/web/static/src/js/views/basic/basic_controller.js10
1 files changed, 4 insertions, 6 deletions
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 8a9b3713f15..b4d00b6bb76 100644
--- a/addons/web/static/src/js/views/basic/basic_controller.js
+++ b/addons/web/static/src/js/views/basic/basic_controller.js
@@ -314,7 +314,7 @@ var BasicController = AbstractController.extend(FieldManagerMixin, {
*
* @private
*/
- _disableButtons: function () {
+ _disableButtons: function () {
if (this.$buttons) {
this.$buttons.find('button').attr('disabled', true);
}
@@ -346,10 +346,8 @@ var BasicController = AbstractController.extend(FieldManagerMixin, {
return;
}
self.model.discardChanges(recordID);
- if (self.model.isNew(recordID)) {
- if (self.model.canBeAbandoned(recordID)) {
- self._abandonRecord(recordID);
- }
+ if (self.model.canBeAbandoned(recordID)) {
+ self._abandonRecord(recordID);
return;
}
return self._confirmSave(recordID);
@@ -360,7 +358,7 @@ var BasicController = AbstractController.extend(FieldManagerMixin, {
*
* @private
*/
- _enableButtons: function () {
+ _enableButtons: function () {
if (this.$buttons) {
this.$buttons.find('button').removeAttr('disabled');
}