v2.0.10

CHANGELOG.md

@@ -1,5 +1,14 @@
 # Solspace Calendar Changelog
 
+## 2.0.10 - 2018-11-08
+### Changed
+- Updated demo templates to use Bootstrap 4.1 and made some general improvements.
+- Updated event validation to no longer allow multi-day events to span longer than 365 days to prevent performance issues.
+
+### Fixed
+- Fixed a bug where editing events on the front end with Select Dates rule enabled would result in an error.
+- Fixed a bug where the `.one()` method was not working correctly for Event query.
+
 ## 2.0.9 - 2018-11-01
 ### Changed
 - Updated demo templates approach for viewing individual recurrences to validate that the date segments in URL match against an available recurrence.

composer.json

@@ -1,9 +1,8 @@
 {
   "name": "solspace/craft3-calendar",
   "description": "The most powerful event management plugin for Craft.",
-  "version": "2.0.9",
+  "version": "2.0.10",
   "type": "craft-plugin",
-  "minimum-stability": "dev",
   "authors": [
     {
       "name": "Solspace",
@@ -17,7 +16,7 @@
     "symfony/property-access": "^2.8|^3.0|^4.0",
     "symfony/finder": "^2.8|^3.0|^4.0",
     "symfony/filesystem": "^2.8|^3.0|^4.0",
-    "solspace/craft3-commons": "^1.0.8",
+    "solspace/craft3-commons": "^1.0.16",
     "nesbot/carbon": "^1.22.1"
   },
   "autoload": {

src/Elements/Db/EventQuery.php

@@ -19,6 +19,8 @@
 
 class EventQuery extends ElementQuery implements \Countable
 {
+    const MAX_EVENT_LENGTH_DAYS = 365;
+
     const FORMAT_MONTH = 'Ym';
     const FORMAT_WEEK  = 'YW';
     const FORMAT_DAY   = 'Ymd';
@@ -428,6 +430,27 @@ public function count($q = '*', $db = null): int
         return $this->totalCount;
     }
 
+    /**
+     * @param null $db
+     *
+     * @return array|\craft\base\ElementInterface|null
+     */
+    public function one($db = null)
+    {
+        $oldLimit = $this->limit;
+        $this->limit = 1;
+
+        $events = $this->all($db);
+
+        $this->limit = $oldLimit;
+
+        if (\count($events) >= 1) {
+            return reset($events);
+        }
+
+        return null;
+    }
+
     /**
      * @param null $db
      *
@@ -1243,7 +1266,7 @@ private function cacheEvents()
             }
 
             $day = $startDate->copy();
-            for ($i = 0; $i <= $diffInDays; $i++) {
+            for ($i = 0; $i <= $diffInDays && $i <= self::MAX_EVENT_LENGTH_DAYS; $i++) {
                 if ($this->overlapThreshold && $i !== 0 && $i === $diffInDays) {
                     if (DateHelper::isDateBeforeOverlap($endDate, $this->overlapThreshold)) {
                         break;

src/Elements/Event.php

@@ -32,6 +32,8 @@ class Event extends Element implements \JsonSerializable
     const UNTIL_TYPE_UNTIL   = 'until';
     const UNTIL_TYPE_COUNT   = 'count';
 
+    const SPAN_LIMIT_DAYS = 365;
+
     /** @var int */
     private static $overlapThreshold;
 
@@ -1366,6 +1368,10 @@ public function validateDates()
         if ($this->startDate >= $this->endDate) {
             $this->addError('startDate', Calendar::t('Start Date must be before End Date'));
         }
+
+        if ($this->startDate->diffInDays($this->endDate, true) > self::SPAN_LIMIT_DAYS) {
+            $this->addError('startDate', Calendar::t('The maximum time span of an event is 365 days'));
+        }
     }
 
     /**

src/Models/SelectDateModel.php

@@ -18,4 +18,12 @@ class SelectDateModel extends Model
 
     /** @var \DateTime */
     public $date;
+
+    /**
+     * @return string
+     */
+    public function __toString(): string
+    {
+        return $this->date->format('Y-m-d');
+    }
 }

src/codepack/assets/css/main.css

@@ -1,8 +1,5 @@
 /* GLOBAL */
 
-body {
-	margin-top: 30px;
-}
 .ss-pageinfo {
 	margin-top: 30px;
 }
@@ -19,7 +16,7 @@ body {
 	width: 100%;
 }
 #month_calendar table, #month_calendar tr, #month_calendar td {
-	padding: 0px;
+	padding: 0;
 }
 #month_calendar_outer {
 	width: 100%;
@@ -144,7 +141,7 @@ body {
 #month_calendar #month_year th.right {
 	text-align: right;
 }
-#month_calendar .popover-title span.event_time {
+.popover-header span.event_time {
 	display: block;
 	color: #4f4f4f;
 	font-size: 85%;
@@ -285,7 +282,7 @@ body {
 
 	width: 30px;
 	height: 30px;
-	padding: 5px 0 0;
+	padding: 3px 0 0;
 
 	border-radius: 4px;
 
@@ -302,6 +299,7 @@ body {
 .freq-list.freq-list-large input[type=checkbox] + label {
 	display: block;
 	width: 100%;
+	padding: 3px 10px 0;
 }
 
 .freq-list.freq-list-large > div div.row {