v2.0.12

solspace · Dec 28, 2018 · cb4c34a · cb4c34a
1 parent 5e7ac10
commit cb4c34a
Show file tree

Hide file tree

Showing 8 changed files with 62 additions and 15 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,14 @@
 # Solspace Calendar Changelog
 
+## 2.0.12 - 2018-12-28
+### Changed
+- Updated Demo Templates installer to be compatible with Craft 3.1.
+- Updated Live Preview feature to be compatible with Craft 3.1.
+
+### Fixed
+- Fixed a bug where pagination was not working reliably for `calendar.events`.
+- Fixed a bug where editing events with Select Dates repeat rule via front end could trigger some errors or was showing blank.
+
 ## 2.0.11 - 2018-12-13
 ### Changed
 - Updated the Full Calendar JS demo templates to have a limit of 500 events to allow websites with many events to work more reliably by default.

diff --git a/composer.json b/composer.json
@@ -1,7 +1,7 @@
 {
   "name": "solspace/craft3-calendar",
   "description": "The most powerful event management plugin for Craft.",
-  "version": "2.0.11",
+  "version": "2.0.12",
   "type": "craft-plugin",
   "authors": [
     {

diff --git a/src/Controllers/EventsController.php b/src/Controllers/EventsController.php
@@ -394,7 +394,7 @@ private function renderEditForm(Event $event, string $title): Response
                     'fields'        => '#title-field, #fields .calendar-event-wrapper > .field, #fields > .field > .field',
                     'extraFields'   => '#settings',
                     'previewUrl'    => $event->getUrl(),
-                    'previewAction' => 'calendar/events/preview',
+                    'previewAction' => \Craft::$app->getSecurity()->hashData('calendar/events/preview'),
                     'previewParams' => [
                         'eventId'    => $event->id,
                         'siteId'     => $event->siteId,

diff --git a/src/Elements/Db/EventQuery.php b/src/Elements/Db/EventQuery.php
@@ -490,7 +490,6 @@ public function all($db = null): array
             $this->offset = null;
 
             $ids = parent::ids($db);
-            $this->totalCount = \count($ids);
 
             $this->limit  = $limit;
             $this->offset = $offset;
@@ -519,6 +518,8 @@ public function all($db = null): array
                 shuffle($this->eventCache);
             }
 
+            $this->totalCount = \count($this->eventCache);
+
             // Remove excess dates based on ::$limit and ::$offset
             $this->cutOffExcess($this->eventCache);
 

diff --git a/src/Library/CodePack/Components/RoutesComponent.php b/src/Library/CodePack/Components/RoutesComponent.php
@@ -4,6 +4,7 @@
 
 use craft\db\Query;
 use craft\helpers\Json;
+use craft\services\ProjectConfig;
 
 class RoutesComponent extends AbstractJsonComponent
 {
@@ -16,6 +17,13 @@ public function install(string $prefix = null)
     {
         $routeService = \Craft::$app->routes;
 
+        $existingRoutes = [];
+        if (version_compare(\Craft::$app->getVersion(), '3.1', '>=')) {
+            /** @var ProjectConfig $config */
+            $config         = \Craft::$app->getProjectConfig();
+            $existingRoutes = $config->get('routes');
+        }
+
         $data       = $this->getData();
         $demoFolder = $prefix . '/';
 
@@ -63,13 +71,18 @@ public function install(string $prefix = null)
                     }
                 }
 
-                $id = (new Query())
-                    ->select('id')
-                    ->from('{{%routes}}')
-                    ->where(['uriParts' => Json::encode($uriParts)])
-                    ->scalar();
-
-                $routeService->saveRoute($urlParts, $template, null, $id ?: null);
+                if (version_compare(\Craft::$app->getVersion(), '3.1', '>=')) {
+                    $uuid = $this->findExistingRoute($uriParts, $existingRoutes);
+                    $routeService->saveRoute($urlParts, $template, null, $uuid);
+                } else {
+                    $id = (new Query())
+                        ->select('id')
+                        ->from('{{%routes}}')
+                        ->where(['uriParts' => Json::encode($uriParts)])
+                        ->scalar();
+
+                    $routeService->saveRoute($urlParts, $template, null, $id ?: null);
+                }
             }
         }
     }
@@ -82,4 +95,25 @@ protected function setProperties()
     {
         $this->fileName = 'routes.json';
     }
+
+    /**
+     * @param array      $uriParts
+     * @param array|null $existingRoutes
+     *
+     * @return int|string|null
+     */
+    private function findExistingRoute(array $uriParts, array $existingRoutes = null)
+    {
+        if (!$existingRoutes) {
+            return null;
+        }
+
+        foreach ($existingRoutes as $uuid => $route) {
+            if (Json::encode($route['uriParts']) === Json::encode($uriParts)) {
+                return $uuid;
+            }
+        }
+
+        return null;
+    }
 }
diff --git a/src/Resources/css/src/event-edit.css b/src/Resources/css/src/event-edit.css
diff --git a/src/Services/CalendarsService.php b/src/Services/CalendarsService.php
@@ -549,8 +549,11 @@ public function isEventTemplateValid(CalendarModel $calendar, int $siteId): bool
         $oldTemplateMode = $view->getTemplateMode();
         $view->setTemplateMode($view::TEMPLATE_MODE_SITE);
 
-        // Does the template exist?
-        $templateExists = \Craft::$app->getView()->doesTemplateExist((string) $siteSettings->template);
+        $templateExists = false;
+        if ($siteSettings->template) {
+            // Does the template exist?
+            $templateExists = \Craft::$app->getView()->doesTemplateExist((string) $siteSettings->template);
+        }
 
         // Restore the original template mode
         $view->setTemplateMode($oldTemplateMode);

diff --git a/src/codepack/templates/edit.html b/src/codepack/templates/edit.html
@@ -420,13 +420,13 @@ <h1>Event Edit</h1>
                         <div class="form-group row select-dates-list" data-repeats data-show-for="select_dates">
                             {% for selectDate in event.selectDatesAsDates %}
                                 <div class="col-12 col-sm-10 offset-sm-2">
-                                    <input type="hidden" name="calendarEvent[selectDates][]" value="{{ selectDate.date.toDateTimeString }}" />
+                                    <input type="hidden" name="calendarEvent[selectDates][]" value="{{ selectDate.toDateTimeString }}" />
                                     <a href="javascript:;"
                                        class="remove-select-date"
                                        style="color: darkred; text-decoration: none; position: relative; top: 1px;">
                                         <span class="far fa-times-circle"></span>
                                     </a>
-                                    {{ selectDate.date.format('l, F j, Y') }}
+                                    {{ selectDate.format('l, F j, Y') }}
                                 </div>
                             {% endfor %}
                         </div>