From 0f98d59064532675cf36ff33a70ee072e2ce2123 Mon Sep 17 00:00:00 2001
From: fwi-odoo <fwi@odoo.com>
Date: Sat, 30 Sep 2017 12:05:42 +0200
Subject: [PATCH] [FIX] web: calendar avoid double event creation

Before this commit, pressing tab then enter was generating a traceback because
the event creation and modal deletion was done twice.
This commit adds a protection to be sure that we are doing only one event
creation.
---
 .../js/views/calendar/calendar_controller.js  | 12 ++++-
 .../web/static/tests/views/calendar_tests.js  | 51 +++++++++++++++++++
 2 files changed, 62 insertions(+), 1 deletion(-)

diff --git a/addons/web/static/src/js/views/calendar/calendar_controller.js b/addons/web/static/src/js/views/calendar/calendar_controller.js
index 8d27acb43dd..4168d901065 100644
--- a/addons/web/static/src/js/views/calendar/calendar_controller.js
+++ b/addons/web/static/src/js/views/calendar/calendar_controller.js
@@ -48,6 +48,8 @@ var CalendarController = AbstractController.extend({
         this.readonlyFormViewId = params.readonlyFormViewId;
         this.mapping = params.mapping;
         this.context = params.context;
+        // The quickCreating attribute ensures that we don't do several create
+        this.quickCreating = false;
     },
 
     //--------------------------------------------------------------------------
@@ -153,18 +155,26 @@ var CalendarController = AbstractController.extend({
      */
     _onQuickCreate: function (event) {
         var self = this;
+        if (this.quickCreating) {
+            return;
+        }
+        this.quickCreating = true;
         this.model.createRecord(event)
             .then(function (id) {
                 self.quick.destroy();
                 self.quick = null;
                 self.reload(id);
-            }, function (error, errorEvent) {
+            })
+            .fail(function (error, errorEvent) {
                 // This will occurs if there are some more fields required
                 // Preventdefaulting the error event will prevent the traceback window
                 errorEvent.preventDefault();
                 event.data.options.disableQuickCreate = true;
                 event.data.data.on_save = self.quick.destroy.bind(self.quick);
                 self._onOpenCreate(event.data);
+            })
+            .always(function () {
+                self.quickCreating = false;
             });
     },
     /**
diff --git a/addons/web/static/tests/views/calendar_tests.js b/addons/web/static/tests/views/calendar_tests.js
index f1caba9ed4a..ecf02be9c4a 100644
--- a/addons/web/static/tests/views/calendar_tests.js
+++ b/addons/web/static/tests/views/calendar_tests.js
@@ -1288,6 +1288,57 @@ QUnit.module('Views', {
             "should be one event in the all day row");
         calendar.destroy();
     });
+
+    QUnit.test('quickcreate avoid double event creation', function (assert) {
+        assert.expect(1);
+        var createCount = 0;
+        var def = $.Deferred();
+        var calendar = createView({
+            View: CalendarView,
+            model: 'event',
+            data: this.data,
+            arch: '<calendar class="o_calendar_test" '+
+                'string="Events" ' +
+                'event_open_popup="true" '+
+                'date_start="start" '+
+                'date_stop="stop" '+
+                'all_day="allday" '+
+                'mode="month" '+
+                'readonly_form_view_id="1">'+
+                    '<field name="name"/>'+
+            '</calendar>',
+            archs: archs,
+            viewOptions: {
+                initialDate: initialDate,
+            },
+            mockRPC: function (route, args) {
+                var result = this._super(route, args);
+                if (args.method === "create") {
+                    createCount++;
+                    return def.then(_.constant(result));
+                }
+                return result;
+            },
+        });
+
+        // create a new event
+        var $cell = calendar.$('.fc-day-grid .fc-row:eq(2) .fc-day:eq(2)');
+        testUtils.triggerMouseEvent($cell, "mousedown");
+        testUtils.triggerMouseEvent($cell, "mouseup");
+        var $input = $('.modal-body input:first');
+        $input.val('new event in quick create').trigger('input');
+        // Simulate ENTER pressed on Create button (after a TAB)
+        $input.trigger($.Event('keyup', {
+            which: $.ui.keyCode.ENTER,
+            keyCode: $.ui.keyCode.ENTER,
+        }));
+        $('.modal-footer button:first').click();
+        def.resolve();
+        assert.strictEqual(createCount, 1,
+            "should create only one event");
+
+        calendar.destroy();
+    });
 });
 
 });