From 4dddf30a6361218348127348788983349b14d4c3 Mon Sep 17 00:00:00 2001
From: Yuriy Bakhtin <yurybakh@gmail.com>
Date: Fri, 12 Jul 2024 16:53:13 +0200
Subject: [PATCH 1/3] Renaming page and snippet to global and space types

---
 docs/CHANGELOG.md                 |  4 ++++
 models/CustomContentContainer.php |  2 +-
 models/PageType.php               | 29 +++++++++++------------------
 module.json                       |  2 +-
 4 files changed, 17 insertions(+), 20 deletions(-)

diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md
index b0e81e0b..5e870af5 100644
--- a/docs/CHANGELOG.md
+++ b/docs/CHANGELOG.md
@@ -1,6 +1,10 @@
 Changelog
 =========
 
+1.10.5 (Unreleased)
+----------------------
+- Enh #337: Renaming page and snippet to global and space types
+
 1.10.4 (June 19, 2024)
 ----------------------
 - Fix #328: Missing Iframe attributes in snippet
diff --git a/models/CustomContentContainer.php b/models/CustomContentContainer.php
index fd88778e..f4c44f9f 100644
--- a/models/CustomContentContainer.php
+++ b/models/CustomContentContainer.php
@@ -229,7 +229,7 @@ public function getContentName()
             return $target->contentName;
         }
 
-        return PageType::getContentName($this->getPageType());
+        return PageType::getContentName($this->getPageType(), $this->content ? $this->content->getContainer() : null);
     }
 
     private function getRulesByContentType()
diff --git a/models/PageType.php b/models/PageType.php
index 9eaf48e9..1473bad3 100644
--- a/models/PageType.php
+++ b/models/PageType.php
@@ -1,33 +1,26 @@
 <?php
 
-
 namespace humhub\modules\custom_pages\models;
 
-
+use humhub\modules\content\components\ContentContainerActiveRecord;
 use Yii;
 
 abstract class PageType
 {
-    const Page = 'page';
-    const Snippet = 'snippet';
-
-    public static function getLabel($type)
-    {
-        switch ($type) {
-            case static::Page:
-                return Yii::t('CustomPagesModule.models_Page', 'page');
-            case static::Snippet:
-                return Yii::t('CustomPagesModule.models_ContainerSnippet', 'snippet');
-        }
-    }
+    public const Page = 'page';
+    public const Snippet = 'snippet';
 
-    public static function getContentName($type)
+    public static function getContentName($type, ?ContentContainerActiveRecord $container = null)
     {
         switch ($type) {
             case static::Page:
-                return Yii::t('CustomPagesModule.models_Page', 'Page');
+                return $container === null
+                    ? Yii::t('CustomPagesModule.models_Page', 'Global Page')
+                    : Yii::t('CustomPagesModule.models_Page', 'Space Page');
             case static::Snippet:
-                return Yii::t('CustomPagesModule.models_ContainerSnippet', 'Snippet');
+                return $container === null
+                    ? Yii::t('CustomPagesModule.models_ContainerSnippet', 'Global Widget')
+                    : Yii::t('CustomPagesModule.models_ContainerSnippet', 'Space Widget');
         }
     }
-}
\ No newline at end of file
+}
diff --git a/module.json b/module.json
index 002ad690..f73bdf26 100644
--- a/module.json
+++ b/module.json
@@ -3,7 +3,7 @@
     "name": "Custom Pages",
     "description": "Create custom pages and widgets and share them with your users. Take advantage of a wide range of editing options, including HTML and Markdown.",
     "keywords": ["pages", "custom", "iframe", "markdown", "link", "navigation", "spaces"],
-    "version": "1.10.4",
+    "version": "1.10.5",
     "homepage": "https://github.com/humhub/custom-pages",
     "humhub": {
         "minVersion": "1.14"

From a37564d34531d07cdf218fcd4f5f9ab68dd5c0ad Mon Sep 17 00:00:00 2001
From: Yuriy Bakhtin <yurybakh@gmail.com>
Date: Fri, 12 Jul 2024 17:14:18 +0200
Subject: [PATCH 2/3] Renaming page and snippet to global and space types

---
 models/CustomContentContainer.php |  4 +++-
 models/PageType.php               | 15 ++++++++-------
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/models/CustomContentContainer.php b/models/CustomContentContainer.php
index f4c44f9f..9ad410ba 100644
--- a/models/CustomContentContainer.php
+++ b/models/CustomContentContainer.php
@@ -229,7 +229,9 @@ public function getContentName()
             return $target->contentName;
         }
 
-        return PageType::getContentName($this->getPageType(), $this->content ? $this->content->getContainer() : null);
+        $containerClass = $this instanceof ContainerPage || $this instanceof ContainerSnippet ? Space::class : null;
+
+        return PageType::getContentName($this->getPageType(), $containerClass);
     }
 
     private function getRulesByContentType()
diff --git a/models/PageType.php b/models/PageType.php
index 1473bad3..78901b8b 100644
--- a/models/PageType.php
+++ b/models/PageType.php
@@ -3,6 +3,7 @@
 namespace humhub\modules\custom_pages\models;
 
 use humhub\modules\content\components\ContentContainerActiveRecord;
+use humhub\modules\space\models\Space;
 use Yii;
 
 abstract class PageType
@@ -10,17 +11,17 @@ abstract class PageType
     public const Page = 'page';
     public const Snippet = 'snippet';
 
-    public static function getContentName($type, ?ContentContainerActiveRecord $container = null)
+    public static function getContentName($type, ?string $containerClass = null)
     {
         switch ($type) {
             case static::Page:
-                return $container === null
-                    ? Yii::t('CustomPagesModule.models_Page', 'Global Page')
-                    : Yii::t('CustomPagesModule.models_Page', 'Space Page');
+                return $containerClass === Space::class
+                    ? Yii::t('CustomPagesModule.base', 'Space Page')
+                    : Yii::t('CustomPagesModule.base', 'Global Page');
             case static::Snippet:
-                return $container === null
-                    ? Yii::t('CustomPagesModule.models_ContainerSnippet', 'Global Widget')
-                    : Yii::t('CustomPagesModule.models_ContainerSnippet', 'Space Widget');
+                return $containerClass === Space::class
+                    ? Yii::t('CustomPagesModule.base', 'Space Widget')
+                    : Yii::t('CustomPagesModule.base', 'Global Widget');
         }
     }
 }

From 47d0518d16b9a0bfcba7c4894efc33793d00ef89 Mon Sep 17 00:00:00 2001
From: Yuriy Bakhtin <yurybakh@gmail.com>
Date: Fri, 12 Jul 2024 17:16:21 +0200
Subject: [PATCH 3/3] Update CHANGELOG.md

---
 docs/CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md
index 5e870af5..2797c931 100644
--- a/docs/CHANGELOG.md
+++ b/docs/CHANGELOG.md
@@ -3,7 +3,7 @@ Changelog
 
 1.10.5 (Unreleased)
 ----------------------
-- Enh #337: Renaming page and snippet to global and space types
+- Enh #336: Renaming page and snippet to global and space types
 
 1.10.4 (June 19, 2024)
 ----------------------