4.2.4

ryssbowh · Sep 8, 2022 · 80cdde0 · 80cdde0
1 parent 2a93945
commit 80cdde0
Show file tree

Hide file tree

Showing 8 changed files with 57 additions and 13 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,13 @@
 # ryssbowh/craft-themes Changelog
 
+## 4.2.4 - 2022-09-08
+
+### Fixed
+- Fixed error when changing a field's type
+- Fixed ajax url for overriden templates utility
+- Added missing register form block options
+- Fixed potential issue with block cache strategies
+
 ## 4.2.3 - 2022-08-08
 
 ### Fixed

diff --git a/src/assets/dist/utilities.js b/src/assets/dist/utilities.js
diff --git a/src/assets/js/utilities.js b/src/assets/js/utilities.js
@@ -24,12 +24,13 @@ var ThemesUtility = {
         this.$resultContainer.html('');
         this.toggleSpinner(true);
         let data = {
-            theme: this.$select.val()
+            theme: this.$select.val(),
+            action: 'themes/cp-themes/overridden-templates'
         };
         data[Craft.csrfTokenName] = Craft.csrfTokenValue;
         $.ajax({
             method: 'post',
-            url: '/?action=themes/cp-themes/overridden-templates',
+            url: Craft.getActionUrl('/'),
             data: data
         }).done((data) => {
             this.$resultContainer.html(data);

diff --git a/src/blockCache/GlobalBlockCache.php b/src/blockCache/GlobalBlockCache.php
@@ -68,14 +68,15 @@ public function getDuration(): ?int
     public function buildKey(BlockInterface $block): array
     {
         $key = [self::CACHE_TAG];
+        $identity = \Craft::$app->user->identity;
         if ($this->options->cachePerAuthenticated) {
-            $key[] = \Craft::$app->user ? 'auth' : 'noauth';
+            $key[] = $identity ? 'auth' : 'noauth';
         }
         if ($this->options->cachePerViewport) {
             $key[] = 'view-port-' . $this->getViewPort();
         }
-        if ($this->options->cachePerUser and $user = \Craft::$app->user) {
-            $key[] = 'user-id-' . $user->getIdentity()->id;
+        if ($this->options->cachePerUser and $identity) {
+            $key[] = 'user-id-' . $identity->id;
         }
         if ($this->options->cachePerSite) {
             $site = \Craft::$app->sites->getCurrentSite();

diff --git a/src/blockCache/PathBlockCache.php b/src/blockCache/PathBlockCache.php
@@ -44,14 +44,15 @@ public function getDescription(): string
     public function buildKey(BlockInterface $block): array
     {
         $key = [self::CACHE_TAG, 'path-' . \Craft::$app->request->getFullPath()];
+        $identity = \Craft::$app->user->identity;
         if ($this->options->cachePerAuthenticated) {
-            $key[] = \Craft::$app->user ? 'auth' : 'noauth';
+            $key[] = $identity ? 'auth' : 'noauth';
         }
         if ($this->options->cachePerViewport) {
             $key[] = 'view-port-' . $this->getViewPort();
         }
-        if ($this->options->cachePerUser and $user = \Craft::$app->user) {
-            $key[] = 'user-id-' . $user->getIdentity()->id;
+        if ($this->options->cachePerUser and $identity) {
+            $key[] = 'user-id-' . $identity->id;
         }
         if ($this->options->cachePerSite) {
             $site = \Craft::$app->sites->getCurrentSite();

diff --git a/src/blockCache/QueryBlockCache.php b/src/blockCache/QueryBlockCache.php
@@ -44,14 +44,15 @@ public function getDescription(): string
     public function buildKey(BlockInterface $block): array
     {
         $key = [self::CACHE_TAG, 'query- ' . \Craft::$app->request->getFullPath() . '?' . \Craft::$app->request->getQueryStringWithoutPath()];
+        $identity = \Craft::$app->user->identity;
         if ($this->options->cachePerAuthenticated) {
-            $key[] = \Craft::$app->user ? 'auth' : 'noauth';
+            $key[] = $identity ? 'auth' : 'noauth';
         }
         if ($this->options->cachePerViewport) {
             $key[] = 'view-port-' . $this->getViewPort();
         }
-        if ($this->options->cachePerUser and $user = \Craft::$app->user) {
-            $key[] = 'user-id-' . $user->getIdentity()->id;
+        if ($this->options->cachePerUser and $identity) {
+            $key[] = 'user-id-' . $identity->id;
         }
         if ($this->options->cachePerSite) {
             $site = \Craft::$app->sites->getCurrentSite();

diff --git a/src/models/blockOptions/RegisterFormBlockOptions.php b/src/models/blockOptions/RegisterFormBlockOptions.php
@@ -8,4 +8,36 @@
  */
 class RegisterFormBlockOptions extends BlockOptions
 {
+    /**
+     * @inheritDoc
+     */
+    public function defineOptions(): array
+    {
+        return [
+            'onlyIfNotAuthenticated' => [
+                'field' => 'lightswitch',
+                'label' => \Craft::t('themes', 'Show only if the user is not authenticated')
+            ]
+        ];
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function defineDefaultValues(): array
+    {
+        return [
+            'onlyIfNotAuthenticated' => true,
+        ];
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function defineRules(): array
+    {
+        return array_merge(parent::defineRules(), [
+            ['onlyIfNotAuthenticated', 'boolean', 'trueValue' => true, 'falseValue' => false],
+        ]);
+    }
 }
diff --git a/src/services/FieldsService.php b/src/services/FieldsService.php
@@ -230,7 +230,7 @@ public function onCraftFieldSaved(FieldEvent $event)
                     'visuallyHidden' => $field->labelVisuallyHidden,
                     'labelVisuallyHidden' => $field->labelVisuallyHidden,
                     'hidden' => $newField->hidden ?: $field->hidden,
-                    'display' => $display
+                    'display_id' => $display->id
                 ]);
                 $this->save($newField);
             } else {