From ecf1d18c14ea35fba27d8ccd09d312ce7cc4651b Mon Sep 17 00:00:00 2001 From: Sergi Almacellas Abellana Date: Thu, 7 Jun 2018 14:36:15 +0200 Subject: [PATCH] Call on_change methods after setting default dtstart on calendar view issue7496 review48441002 --- CHANGELOG | 1 + src/screen.js | 10 +++++++--- src/view/calendar.js | 3 +++ 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index 2526e07ae8..88b07dafc3 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,4 @@ +* Call on_change methods after setting default dtstart on calendar view * Allow to open in new tab Many2One and Reference with CTRL key * Store session in browser storage * Increase the space available for tab list diff --git a/src/screen.js b/src/screen.js index 0b692a4c35..4b6d6e5493 100644 --- a/src/screen.js +++ b/src/screen.js @@ -1223,11 +1223,15 @@ return prm.then(function() { group.add(record, this.new_model_position()); this.set_current_record(record); + var prm = jQuery.when(); if (previous_view.view_type == 'calendar') { - previous_view.set_default_date(record, selected_date); + prm = previous_view.set_default_date( + record, selected_date); } - this.display().done(function() { - this.set_cursor(true, true); + prm.then(function() { + this.display().done(function() { + this.set_cursor(true, true); + }.bind(this)); }.bind(this)); return record; }.bind(this)); diff --git a/src/view/calendar.js b/src/view/calendar.js index b9f3ead0e7..ab7a66d9fa 100644 --- a/src/view/calendar.js +++ b/src/view/calendar.js @@ -273,6 +273,9 @@ selected_date = Sao.Date(selected_date); } field.set(record, selected_date); + return record.on_change([dtstart]).then(function() { + return record.on_change_with([dtstart]); + }); }, get_selected_date: function(){ return this.el.fullCalendar('getDate');