[ADD] Bind form warning to Cancel button
authorFabien Meghazi <fme@openerp.com>
Wed, 15 Feb 2012 12:39:01 +0000 (13:39 +0100)
committerFabien Meghazi <fme@openerp.com>
Wed, 15 Feb 2012 12:39:01 +0000 (13:39 +0100)
bzr revid: fme@openerp.com-20120215123901-po1dk32p9lbgadjk

addons/web/static/src/js/view_form.js

index 366dfad..640fff6 100644 (file)
@@ -145,6 +145,7 @@ openerp.web.FormView = openerp.web.View.extend( /** @lends openerp.web.FormView#
     do_show: function () {
         var self = this;
         this.$element.show().css('visibility', 'hidden');
+        this.$element.removeClass('oe_form_dirty');
         return this.has_been_loaded.pipe(function() {
             var result;
             if (self.dataset.index === null) {
@@ -447,7 +448,9 @@ openerp.web.FormView = openerp.web.View.extend( /** @lends openerp.web.FormView#
         });
     },
     on_button_cancel: function() {
-        return this.do_prev_view({'default': 'page'});
+        if (this.can_be_discarded()) {
+            return this.do_prev_view({'default': 'page'});
+        }
     },
     on_button_new: function() {
         var self = this;