verdnatura/salix
verdnatura
/
salix
3
4
Fork 0
Code Issues Pull Requests 64 Releases Wiki Activity

Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head There was a failure building this commit Details

This commit is contained in:
Joan Sanchez 2020-09-07 08:01:29 +02:00
parent 637f0e392d ba9cfedec7
commit 955de285f2
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/worker/front/calendar/index.js
View File

@ -91,7 +91,7 @@ class Controller extends Section {
if (data.holidays) { if (data.holidays) {
data.holidays.forEach(holiday => { data.holidays.forEach(holiday => {
const holidayDetail = holiday.detail && holiday.detail.description; const holidayDetail = holiday.detail && holiday.detail.name;
const holidayType = holiday.type && holiday.type.name; const holidayType = holiday.type && holiday.type.name;
const holidayName = holidayDetail || holidayType; const holidayName = holidayDetail || holidayType;