audrius/pms
1
0
Fork 1
mirror of https://github.com/OCA/pms.git synced 2025-01-29 00:17:45 +02:00
Code Issues Packages Projects Releases Wiki Activity

[FIX] Santize id calendar management

Browse Source
This commit is contained in:
QS5ELkMu
2018-12-18 19:50:38 +01:00
parent d49419a29b
commit a6d7968b8a
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
hotel_calendar/static/src/lib/hcalendar/js/hcalendar.js
View File

@@ -339,7 +339,7 @@ HotelCalendar.prototype = {
} }
this._updateReservation(r); this._updateReservation(r);
} }
this._updateReservationsMap();
this._assignReservationsEvents(toAssignEvents); this._assignReservationsEvents(toAssignEvents);
}.bind(this), addedReservations); }.bind(this), addedReservations);
@@ -1508,7 +1508,8 @@ HotelCalendar.prototype = {
} }
// Invalid? // Invalid?
if (nreserv.room.id !== uniRoom || (!nreserv.startDate.isSame(dateLimits[1], 'day') && !nreserv.endDate.isSame(dateLimits[0], 'day'))) if (nreserv.room.id !== uniRoom || (!nreserv.startDate.isSame(dateLimits[1], 'day') && !nreserv.endDate.isSame(dateLimits[0], 'day')) ||
(nreserv.id !== refUnifyReservation.id && nreserv.getUserData('parent_reservation') !== refUnifyReservation.id))
{ {
nreserv._html.classList.add('hcal-reservation-invalid-unify'); nreserv._html.classList.add('hcal-reservation-invalid-unify');
} }

2
hotel_calendar/static/src/lib/hcalendar/js/hcalendar_management.js
View File

@@ -769,7 +769,7 @@ HotelCalendarManagement.prototype = {
}, },
_sanitizeId: function(/*String*/str) { _sanitizeId: function(/*String*/str) {
return str.replace(/[^a-zA-Z0-9\.\-_:]/g, '_'); return str.replace(/[^a-zA-Z0-9\-_]/g, '_');
}, },
_isNumeric: function(/*?*/n) { _isNumeric: function(/*?*/n) {