Renaming page and snippet to global and space types

humhub · Jul 12, 2024 · a37564d · a37564d
1 parent 4dddf30
commit a37564d
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 8 deletions.
diff --git 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
@@ -3,24 +3,25 @@
 namespace humhub\modules\custom_pages\models;
 
 use humhub\modules\content\components\ContentContainerActiveRecord;
+use humhub\modules\space\models\Space;
 use Yii;
 
 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');
         }
     }
 }