Merge pull request #208 from solspace/fix/v4/SFT-215

SFT-215 - Improved Calendar Event Site Status list
solspace · Feb 7, 2023 · d579476 · d579476
2 parents a006d27 + ceeb43f
commit d579476
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 3 deletions.
diff --git a/packages/plugin/src/Elements/Db/EventQuery.php b/packages/plugin/src/Elements/Db/EventQuery.php
@@ -482,6 +482,11 @@ public function all($db = null): array
             if (\in_array($context, ['index', 'modal'], true)) {
                 $this->loadOccurrences = false;
             }
+            // If we save an event via the events edit page or via the slide out panel, dont use the cached events
+            $action = \Craft::$app->request->post('action');
+            if (\in_array($action, ['elements/save', 'calendar/events/save-event'], true)) {
+                return parent::all();
+            }
         }
 
         if (null === $this->events || self::$lastCachedConfigStateHash !== $configHash) {

diff --git a/packages/plugin/src/Elements/Event.php b/packages/plugin/src/Elements/Event.php
@@ -485,6 +485,16 @@ public function getFieldLayout(): ?FieldLayout
         if ($this->getCalendar()->hasTitleField) {
             $tabs = $fieldLayout->getTabs();
 
+            if (empty($tabs)) {
+                $tab = new FieldLayoutTab();
+                $tab->name = 'Content';
+                $tab->setLayout($fieldLayout);
+
+                $fieldLayout->setTabs([$tab]);
+
+                $tabs = $fieldLayout->getTabs();
+            }
+
             $hasTitle = !empty(
                 array_filter(
                     $tabs,

diff --git a/packages/plugin/src/Services/EventsService.php b/packages/plugin/src/Services/EventsService.php
@@ -208,7 +208,7 @@ public function saveEvent(Event $event, bool $validateContent = true, bool $bypa
             $transaction = \Craft::$app->db->beginTransaction();
 
             try {
-                $isSaved = \Craft::$app->elements->saveElement($event, $validateContent, $isNewEvent);
+                $isSaved = \Craft::$app->elements->saveElement($event, $validateContent);
                 if (!$isSaved) {
                     return false;
                 }

diff --git a/packages/plugin/src/templates/events/_edit.html b/packages/plugin/src/templates/events/_edit.html
@@ -224,8 +224,8 @@
                 on: event.enabled
             }) }}
 
-            {% for enabledCalendarSiteId in craft.calendar.calendarSites.getAllEnabledSiteIds()|sort %}
-                {% set site = craft.app.sites.getSiteById(enabledCalendarSiteId) %}
+            {% for calendarSiteId, calendarSite in craft.calendar.calendarSites.getSiteSettingsForCalendar(calendar)|sort((a, b) => a.site.id <=> b.site.id) %}
+                {% set site = craft.app.sites.getSiteById(calendarSiteId) %}
                 {{ forms.lightswitchField({
                     label: "{site}"|t('app', { site: site.name }),
                     id: 'enabledForSite-' ~ site.id,