v2.0.0-beta.3

CHANGELOG.md

@@ -1,5 +1,12 @@
 # Solspace Freeform Changelog
 
+## 2.0.0-beta.3 - 2018-03-14
+### Fixed
+- Fixed a bug where the `calendar.events` function was not correctly filtering events by start and end date ranges.
+- Fixed a bug where the Events service was calling `site` instead of `siteId`.
+- Fixed a bug where CP Month/Week/Day views where events that were disabled for some sites were still being included when filtering by those sites.
+- Fixed a bug where the Quick Create events feature in CP Month/Week/Day views was not correctly creating slugs.
+
 ## 2.0.0-beta.2 - 2018-03-13
 ### Fixed
 - Fixed a bug where the `calendar.events` function was not displaying events in order.

composer.json

@@ -1,7 +1,7 @@
 {
   "name": "solspace/craft3-calendar",
   "description": "The most powerful event management plugin for Craft.",
-  "version": "2.0.0-beta.2",
+  "version": "2.0.0-beta.3",
   "type": "craft-plugin",
   "minimum-stability": "dev",
   "authors": [

src/Controllers/EventsApiController.php

@@ -3,6 +3,7 @@
 namespace Solspace\Calendar\Controllers;
 
 use Carbon\Carbon;
+use craft\helpers\ElementHelper;
 use Solspace\Calendar\Calendar;
 use Solspace\Calendar\Elements\Event;
 use Solspace\Calendar\Library\CalendarPermissionHelper;
@@ -209,7 +210,7 @@ public function actionCreate(): Response
 
         $event           = Event::create($siteId, $calendar->id);
         $event->title    = $eventData['title'];
-        $event->slug     = DatabaseHelper::getSuitableSlug($eventData['title']);
+        $event->slug     = ElementHelper::createSlug($event->title ?? '');
         $event->enabled  = true;
         $event->authorId = \Craft::$app->user->id;
 

src/Elements/Db/EventQuery.php

@@ -499,6 +499,22 @@ protected function beforePrepare(): bool
             );
         }
 
+        if ($this->rangeStart) {
+            $rangeStartString = $this->extractDateAsFormattedString($this->rangeStart);
+            $this->subQuery->andWhere(
+                "($table.rrule IS NULL AND $table.startDate >= :rangeStart) OR ($table.rrule IS NOT NULL)",
+                ['rangeStart' => $rangeStartString]
+            );
+        }
+
+        if ($this->rangeEnd) {
+            $rangeEndString = $this->extractDateAsFormattedString($this->rangeEnd);
+            $this->subQuery->andWhere(
+                "$table.endDate <= :rangeEnd",
+                ['rangeEnd' => $rangeEndString]
+            );
+        }
+
         if ($this->allDay) {
             $this->subQuery->andWhere(Db::parseParam($table . '.allDay', (bool) $this->allDay));
         }
@@ -852,7 +868,7 @@ function (array $arrayA, array $arrayB) use ($modifier) {
     private function orderEvents(array &$events)
     {
         $modifier = $this->getSortModifier();
-        $orderBy  = $this->getOrderByField();
+        $orderBy  = $this->getOrderByField() ?? 'startDate';
 
         usort(
             $events,

src/Elements/Event.php

@@ -298,6 +298,26 @@ protected function tableAttributeHtml(string $attribute): string
         }
     }
 
+    /**
+     * @return array
+     * @throws \craft\errors\SiteNotFoundException
+     */
+    public function getSupportedSites(): array
+    {
+        if (static::isLocalized()) {
+            $siteSettings = $this->getCalendar()->getSiteSettings();
+
+            $supportedSites = [];
+            foreach ($siteSettings as $site) {
+                $supportedSites[] = $site->siteId;
+            }
+
+            return $supportedSites;
+        }
+
+        return [\Craft::$app->getSites()->getPrimarySite()->id];
+    }
+
     /**
      * Event constructor.
      *

src/Services/EventsService.php

@@ -52,17 +52,17 @@ public function getEventById(int $eventId, int $siteId = null): Event
      * Returns an event by its slug.
      *
      * @param string $slug
-     * @param string $site
+     * @param int    $siteId
      *
      * @return Event|ElementInterface
      */
-    public function getEventBySlug(string $slug, string $site = null): Event
+    public function getEventBySlug(string $slug, int $siteId = null): Event
     {
         return Event::find()
             ->slug($slug)
             ->setAllowedCalendarsOnly(false)
             ->enabledForSite(false)
-            ->site($site)
+            ->siteId($siteId)
             ->one();
     }