discourse
/
discourse-calendar
mirror of https://github.com/discourse/discourse-calendar.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

DEV: ensure 'post_number' is an integer on the server

This commit is contained in:
Régis Hanol 2019-09-11 23:15:43 +02:00
parent 7682a802e7
commit fcc2c01189
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
assets/javascripts/initializers/discourse-calendar.js.es6
View File

@ -248,7 +248,7 @@ function initializeDiscourseCalendar(api) {
event.extendedProps = { htmlContent: detail.message }; event.extendedProps = { htmlContent: detail.message };
if (detail.post_number) { if (detail.post_number) {
event.extendedProps.postNumber = parseInt(detail.post_number, 10); event.extendedProps.postNumber = detail.post_number;
} else { } else {
event.classNames = ["holiday"]; event.classNames = ["holiday"];
} }

7
plugin.rb
View File

@ -183,14 +183,15 @@ after_initialize do
details = post_custom_fields[DiscourseCalendar::CALENDAR_DETAILS_CUSTOM_FIELD] details = post_custom_fields[DiscourseCalendar::CALENDAR_DETAILS_CUSTOM_FIELD]
Array(details).each do |post_number, (message, from, to, username, recurring)| Array(details).each do |post_number, (message, from, to, username, recurring)|
result << { detail = {
post_number: post_number, post_number: post_number.to_i,
message: message, message: message,
from: from, from: from,
to: to, to: to,
username: username, username: username,
recurring: recurring,
} }
detail[:recurring] = recurring if recurring
result << detail
end end
holidays = post_custom_fields[DiscourseCalendar::CALENDAR_HOLIDAYS_CUSTOM_FIELD] holidays = post_custom_fields[DiscourseCalendar::CALENDAR_HOLIDAYS_CUSTOM_FIELD]