Merge lp:~openerp-dev/openerp-web/7.0-opw-579519-port-vme into lp:openerp-web/7.0

[Vidhin Mehta (OpenERP)]

In FieldDatetime widget when try to work with *datetimepicker of jquery* it calls blur of FieldDatetime and editable list view try to save form.

To Reproduce :https://docs.google.com/open?id=0By4GWTWr6HDNaEs2YWl2TnhSSkU

[Christophe Matthieu (OpenERP) (chm-openerp)]

Hi,
I test with chrome : "My Current Timesheet" => "Details" => "Add an item". I don't see this bug in 7.0 or in trunk.

review: Needs Information

[Vidhin Mehta (OpenERP) (vme-openerp)]

Hi,
    I can still reproduce this bug in both FF and Chrome.
    Please check video :https://docs.google.com/open?id=0By4GWTWr6HDNaEs2YWl2TnhSSkU.

Unmerged revisions

3709. By Vidhin Mehta (OpenERP) on 2013-01-22

[FIX]datetime widget calls blur on one2many listview widget.

=== modified file 'addons/web/static/src/js/view_form.js'
--- addons/web/static/src/js/view_form.js	2013-01-07 16:18:07 +0000
+++ addons/web/static/src/js/view_form.js	2013-01-22 07:32:21 +0000
@@ -2476,6 +2476,10 @@
 
 instance.web.form.FieldDatetime = instance.web.form.AbstractField.extend(instance.web.form.ReinitializeFieldMixin, {
     template: "FieldDatetime",
+    init:function(){
+        this._super.apply(this, arguments);
+        this.in_picker = false;
+    },
     build_widget: function() {
         return new instance.web.DateTimeWidget(this);
     },
@@ -2486,6 +2490,7 @@
         }
     },
     initialize_content: function() {
+        var self = this;
         if (!this.get("effective_readonly")) {
             this.datewidget = this.build_widget();
             this.datewidget.on('datetime_changed', this, _.bind(function() {
@@ -2493,6 +2498,12 @@
             }, this));
             this.datewidget.appendTo(this.$el);
             this.setupFocus(this.datewidget.$input);
+            this.datewidget.picker('option', 'beforeShow', function () {
+               self.in_picker = true;
+            });
+            this.datewidget.picker('option', 'onClose', function () {
+                self.in_picker = false;
+            });
         }
     },
     render_value: function() {
@@ -2502,6 +2513,12 @@
             this.$el.text(instance.web.format_value(this.get('value'), this, ''));
         }
     },
+    setupFocus:function($e){
+        var self = this;
+        var parent = this.getParent();
+        $e.on({blur: function () {if(self.in_picker)parent.__clicked_inside = true;} });
+        this._super($e);
+    },
     is_syntax_valid: function() {
         if (!this.get("effective_readonly") && this.datewidget) {
             return this.datewidget.is_valid_();