v2.0.5

CHANGELOG.md

@@ -1,5 +1,11 @@
 # Solspace Calendar Changelog
 
+## 2.0.5 - 2018-07-26
+### Fixed
+- Fixed a bug where disabled events would error when being viewed/edited.
+- Fixed a bug where Guest access for submitting events on front end was broken.
+- Fixed a bug where Live Preview was not correctly showing some repeat rule options.
+
 ## 2.0.4 - 2018-07-04
 ### Added
 - Added `endsBefore`, `endsBeforeOrAt`, `startsAfter` and `startsAfterOrAt` parameters to `calendar.events` function, for more flexibility to narrow down results.

composer.json

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

src/Controllers/CodePackController.php

@@ -50,7 +50,7 @@ public function actionListContents(): Response
             'calendar/codepack',
             [
                 'codePack' => $codePack,
-                'prefix'   => 'calendar_demo',
+                'prefix'   => 'calendar-demo',
             ]
         );
     }

src/Controllers/EventsController.php

@@ -3,6 +3,7 @@
 namespace Solspace\Calendar\Controllers;
 
 use Carbon\Carbon;
+use craft\db\Query;
 use craft\elements\User;
 use craft\events\ElementEvent;
 use craft\helpers\Json;
@@ -28,7 +29,7 @@ class EventsController extends BaseController
     const EVENT_FIELD_NAME    = 'calendarEvent';
     const EVENT_PREVIEW_EVENT = 'previewEvent';
 
-    protected $allowAnonymous = ['actionSaveEvent'];
+    protected $allowAnonymous = ['save-event'];
 
     /**
      * @return Response
@@ -118,7 +119,7 @@ public function actionEditEvent(int $id, string $siteHandle = null): Response
             EventEditBundle::$locale = $locale;
         }
 
-        $event = $this->getEventsService()->getEventById($id, $siteId);
+        $event = $this->getEventsService()->getEventById($id, $siteId, true);
 
         if (!$event) {
             throw new HttpException(
@@ -177,6 +178,16 @@ public function actionSaveEvent()
             }
         }
 
+        if (!$event->authorId) {
+            $event->authorId = (int) (new Query())
+                ->select('id')
+                ->from('{{%users}}')
+                ->where(['admin' => 1])
+                ->limit(1)
+                ->orderBy(['id' => SORT_ASC])
+                ->scalar();
+        }
+
         $isEnabled      = (bool) \Craft::$app->request->post('enabled', $event->enabled);
         $event->enabled = $isEnabled;
 
@@ -452,7 +463,7 @@ private function getEventModel(): Event
         $calendarId = \Craft::$app->getRequest()->getBodyParam('calendarId');
 
         if ($eventId) {
-            $entry = $this->getEventsService()->getEventById($eventId, $siteId);
+            $entry = $this->getEventsService()->getEventById($eventId, $siteId, true);
 
             if (!$eventId) {
                 throw new NotFoundHttpException('Event not found');
@@ -600,7 +611,7 @@ private function showEvent(Event $event): Response
     private function getExistingOrNewEvent(int $eventId = null, int $siteId = null): Event
     {
         if ($eventId) {
-            $event = $this->getEventsService()->getEventById($eventId, $siteId);
+            $event = $this->getEventsService()->getEventById($eventId, $siteId, true);
 
             if (!$event) {
                 throw new HttpException(

src/Services/EventsService.php

@@ -32,9 +32,9 @@ class EventsService extends Component
      * @param int  $siteId
      * @param bool $includeDisabled
      *
-     * @return Event|ElementInterface
+     * @return Event|ElementInterface|null
      */
-    public function getEventById(int $eventId, int $siteId = null, bool $includeDisabled = false): Event
+    public function getEventById(int $eventId, int $siteId = null, bool $includeDisabled = false)
     {
         $query = Event::find()
             ->setAllowedCalendarsOnly(false)
@@ -56,9 +56,9 @@ public function getEventById(int $eventId, int $siteId = null, bool $includeDisa
      * @param int    $siteId
      * @param bool   $includeDisabled
      *
-     * @return Event|ElementInterface
+     * @return Event|ElementInterface|null
      */
-    public function getEventBySlug(string $slug, int $siteId = null, bool $includeDisabled = false): Event
+    public function getEventBySlug(string $slug, int $siteId = null, bool $includeDisabled = false)
     {
         return Event::find()
             ->slug($slug)
@@ -385,7 +385,7 @@ public function canEditEvent($event): bool
             $eventModel = $this->getEventById($event);
         }
 
-        if (null === $eventModel && null !== $guestAccess) {
+        if ((null === $eventModel || !$eventModel->id) && null !== $guestAccess) {
             return true;
         }
 

src/codepack/templates/layouts/_layout.html

@@ -34,7 +34,7 @@
 
     {% block footer %}
         <div class="footer">
-            <p>&copy; {{ "now".format('Y') }} Solspace, Inc.</p>
+            <p>&copy; {{ "now"|date('Y') }} Solspace, Inc.</p>
         </div>
     {% endblock %}
 </div>

src/templates/codepack/index.html

@@ -21,6 +21,8 @@
 {% endmacro %}
 {% import _self as dir %}
 
+{% block actionButton %}{% endblock %}
+
 {% block content %}
 
     <h2>{{ "Demo Templates"|t('calendar') }}</h2>
@@ -34,7 +36,7 @@ <h2>{{ "Demo Templates"|t('calendar') }}</h2>
             <tr>
                 <td width="95%">
                     {{ forms.textField({
-                        label: "Prefix"|t('calendar'),
+                        label: "Install Path"|t('calendar'),
                         id: 'prefix',
                         name: 'prefix',
                         value: prefix,

src/templates/layouts/_settings.html

@@ -1,8 +1,8 @@
 {% extends "calendar/layouts/_layoutWithoutSettings" %}
 
 {% set selectedSubnavItem = 'settings' %}
-
 {% set title = "Calendar Settings"|t('calendar') %}
+{% set fullPageForm = true %}
 
 {% set navItems = {
 'hd': { heading: "Settings"|t('calendar') },
@@ -15,6 +15,14 @@
 {% set selectedItem = craft.app.request.getSegment(3)|default %}
 {% set docTitle = navItems[selectedItem].title~' - '~title %}
 
+{% block actionButton %}
+    <div class="buttons">
+        <div class="btngroup submit">
+            <input type="submit" class="btn submit" value="{{ 'Save'|t('freeform') }}">
+        </div>
+    </div>
+{% endblock %}
+
 {% block sidebar %}
     <nav>
         <ul>

src/templates/settings/_events.html

@@ -49,8 +49,6 @@ <h2>{{ "Event Settings"|t('calendar') }}</h2>
             value: settings.overlapThreshold,
             errors: settings.getErrors('overlapThreshold')
         }) }}
-
-        <input type="submit" class="btn submit" value="{{ "Save"|t('calendar') }}">
     </form>
 
 {% endblock %}

src/templates/settings/_general.html

@@ -70,8 +70,6 @@ <h2>{{ "General Settings"|t('calendar') }}</h2>
             on: settings.demoBannerDisabled,
             errors: settings.getErrors('demoBannerDisabled')
         }) }}
-
-        <input type="submit" class="btn submit" value="{{ "Save"|t('calendar') }}">
     </form>
 
 {% endblock %}

src/templates/settings/_guest_access.html

@@ -34,8 +34,6 @@ <h2>{{ "Guest Access"|t('calendar') }}</h2>
                 errors: settings.getErrors('guestAccess'),
             }) }}
         </div>
-
-        <input type="submit" class="btn submit" value="{{ "Save"|t('calendar') }}">
     </form>
 
 {% endblock %}

src/translations/en-US/calendar.php

@@ -184,7 +184,7 @@
 ];
 
 $demoTemplates = [
-    'Prefix'    => 'Prefix',
+    'Install Path'    => 'Install Path',
     'Install'   => 'Install',
     'Templates' => 'Templates',
     'Assets'    => 'Assets',