Release 2.0.32 (#4256)

2023-08-31 15:33:53 +02:00
parent 452de88e18
commit 31348da4c0
42 changed files with 412 additions and 130 deletions
--- a/templates/calendar/user.html.twig
+++ b/templates/calendar/user.html.twig
@@ -141,8 +141,8 @@
                    {% for source in google.sources %}
                    ,
                    {
-                        id: 'googleCompanyCalendar',
-                        type: 'google',
+                        id: 'googleCompanyCalendar{{ loop.index }}',
+                        type: '{{ source.typeName }}',
                        options: {
                            googleCalendarId: '{{ source.uri }}',
                            name: '{{ source.id }}',
@@ -152,6 +152,18 @@
                    }
                    {% endfor %}
                    {% endif %}
+                    {% for source in sources %}
+                    ,
+                    {
+                        id: '{{ source.id }}{{ loop.index }}',
+                        type: '{{ source.typeName }}',
+                        url: '{{ source.uri }}',
+                        options: {...{{ source.options|json_encode|raw }}, ...{
+                            color: '{{ source.color }}',
+                            textColor: '{{ source.color|font_contrast }}',
+                        }}
+                    }
+                    {% endfor %}
                ],
                url: {
                    update: (timesheetId) => {