From 0d257305d3ea7eb551cc6b323def2d90b1a5cada Mon Sep 17 00:00:00 2001 From: "Vidhin Mehta (OpenERP)" Date: Thu, 11 Oct 2012 12:58:54 +0530 Subject: [PATCH 1/4] [IMP]replace callbackenable from datetime on_change event. bzr revid: vme@tinyerp.com-20121011072854-l87h37b8apbnzuiu --- addons/web/static/src/js/view_form.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js index afb5e258c0b..e30a6b2cea5 100644 --- a/addons/web/static/src/js/view_form.js +++ b/addons/web/static/src/js/view_form.js @@ -2448,6 +2448,7 @@ instance.web.DateTimeWidget = instance.web.Widget.extend({ return instance.web.format_value(v, {"widget": this.type_of_date}); }, on_change: function() { + this.trigger('datetime_on_change'); if (this.is_valid_()) { this.set_value_from_ui_(); } @@ -2473,9 +2474,9 @@ instance.web.form.FieldDatetime = instance.web.form.AbstractField.extend(instanc initialize_content: function() { if (!this.get("effective_readonly")) { this.datewidget = this.build_widget(); - this.datewidget.on_change.add_last(_.bind(function() { + this.datewidget.on('datetime_on_change', this,_.bind(function() { this.set({'value': this.datewidget.get_value()}); - }, this)); + }, this)) this.datewidget.appendTo(this.$el); this.setupFocus(this.datewidget.$input); } From c85340e995bc56a7246f18e5bf8fb4332ea70455 Mon Sep 17 00:00:00 2001 From: "Vidhin Mehta (OpenERP)" Date: Thu, 11 Oct 2012 13:03:31 +0530 Subject: [PATCH 2/4] [IMP] bzr revid: vme@tinyerp.com-20121011073331-w5xhv6kbr2taphfz --- addons/web/static/src/js/view_form.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js index e30a6b2cea5..ee119f55e67 100644 --- a/addons/web/static/src/js/view_form.js +++ b/addons/web/static/src/js/view_form.js @@ -2476,7 +2476,7 @@ instance.web.form.FieldDatetime = instance.web.form.AbstractField.extend(instanc this.datewidget = this.build_widget(); this.datewidget.on('datetime_on_change', this,_.bind(function() { this.set({'value': this.datewidget.get_value()}); - }, this)) + }, this)); this.datewidget.appendTo(this.$el); this.setupFocus(this.datewidget.$input); } From 942ca6cf164e0faf3f2b75c712c916f91ebf6a3a Mon Sep 17 00:00:00 2001 From: "Vidhin Mehta (OpenERP)" Date: Fri, 12 Oct 2012 15:57:28 +0530 Subject: [PATCH 3/4] [IMP] bzr revid: vme@tinyerp.com-20121012102728-coosthdgxz17z20q --- addons/web/static/src/js/view_form.js | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js index d03c95d6192..a7026a7181e 100644 --- a/addons/web/static/src/js/view_form.js +++ b/addons/web/static/src/js/view_form.js @@ -2378,7 +2378,10 @@ instance.web.DateTimeWidget = instance.web.Widget.extend({ var self = this; this.$input = this.$el.find('input.oe_datepicker_master'); this.$input_picker = this.$el.find('input.oe_datepicker_container'); - this.$input.change(this.on_change); + this.$input.change(function(){ + self.datetime_changed(); + }); + this.picker({ onClose: this.on_picker_select, onSelect: this.on_picker_select, @@ -2446,11 +2449,11 @@ instance.web.DateTimeWidget = instance.web.Widget.extend({ format_client: function(v) { return instance.web.format_value(v, {"widget": this.type_of_date}); }, - on_change: function() { - this.trigger('datetime_on_change'); + datetime_changed: function() { if (this.is_valid_()) { this.set_value_from_ui_(); } + this.trigger("datetime_changed"); } }); @@ -2473,7 +2476,7 @@ instance.web.form.FieldDatetime = instance.web.form.AbstractField.extend(instanc initialize_content: function() { if (!this.get("effective_readonly")) { this.datewidget = this.build_widget(); - this.datewidget.on('datetime_on_change', this,_.bind(function() { + this.datewidget.on('datetime_changed', this, _.bind(function() { this.set({'value': this.datewidget.get_value()}); }, this)); this.datewidget.appendTo(this.$el); From 0602cd5748c46582175109208af58e40af96bb59 Mon Sep 17 00:00:00 2001 From: "Vidhin Mehta (OpenERP)" Date: Fri, 12 Oct 2012 16:01:04 +0530 Subject: [PATCH 4/4] [IMP]trigger event when date is valid. bzr revid: vme@tinyerp.com-20121012103104-pe3w6qs02nygfyb7 --- addons/web/static/src/js/view_form.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js index a7026a7181e..fa8b8713a8f 100644 --- a/addons/web/static/src/js/view_form.js +++ b/addons/web/static/src/js/view_form.js @@ -2452,8 +2452,8 @@ instance.web.DateTimeWidget = instance.web.Widget.extend({ datetime_changed: function() { if (this.is_valid_()) { this.set_value_from_ui_(); + this.trigger("datetime_changed"); } - this.trigger("datetime_changed"); } });