diff --git a/app/assets/javascripts/property_hire_calendar_frontend.js b/app/assets/javascripts/property_hire_calendar_frontend.js index 79091be..52a4a9c 100644 --- a/app/assets/javascripts/property_hire_calendar_frontend.js +++ b/app/assets/javascripts/property_hire_calendar_frontend.js @@ -276,7 +276,7 @@ var Calendar = function(dom,property_id,currentView,display_hire_event){ if(eventStick.recurring === true) c.calendar_dom.calendar.refetchEvents(); else - c.calendar_dom.calendar.renderEvent(eventStick); + c.calendar_dom.calendar.addEvent(eventStick); }; @@ -301,12 +301,12 @@ var EventDialog = function(calendar,event){ _event.allDay = true; } _event.title = _event.event.title; - _event.hiring_person_name = _event.event.extendedProps.hiring_person_name; - _event.error_message = _event.event.extendedProps.error_message; - _event.diff_day = _event.event.extendedProps.diff_day; + var extendedProps = _event.event.extendedProps; + Object.keys(extendedProps).forEach(function(k){ + _event[k] = extendedProps[k]; + }) if(!_event.hiring_person_name) _event.hiring_person_name = ""; - _event.note = _event.event.extendedProps.note; _this_event = _event; var start_time = "", end_time = "",