[FIX] web: calendar don't return to month mode in US

When click on the mini calendar, the calendar does not return to month
mode.
This commit is contained in:
Christophe Matthieu
2017-10-26 09:12:11 +02:00
parent 0c0fb63b0d
commit ffa4646af7
2 changed files with 9 additions and 1 deletions
@@ -113,7 +113,7 @@ var CalendarController = AbstractController.extend({
*/
_onChangeDate: function (event) {
var modelData = this.model.get();
if (modelData.target_date.isSame(event.data.date)) {
if (modelData.target_date.format('YYYY-MM-DD') === event.data.date.format('YYYY-MM-DD')) {
// When clicking on same date, toggle between the two views
switch (modelData.scale) {
case 'month': this.model.setScale('week'); break;
@@ -255,6 +255,8 @@ return AbstractModel.extend({
*/
setDate: function (start, highlight) {
this.data.start_date = this.data.end_date = this.data.target_date = this.data.highlight_date = start;
this.data.start_date.utc().add(this.getSession().getTZOffset(this.data.start_date), 'minutes');
switch (this.data.scale) {
case 'month':
this.data.start_date = this.data.start_date.clone().startOf('month').startOf('week');
@@ -391,6 +393,12 @@ return AbstractModel.extend({
firstDay: moment().startOf('week').isoWeekday(),
};
},
/**
* Return a domain from the date range
*
* @private
* @returns {Array}
*/
_getRangeDomain: function () {
// Build OpenERP Domain to filter object by this.mapping.date_start field
// between given start, end dates.