Fix language default value

lyrasoft · Apr 20, 2024 · 579e35a · 579e35a
1 parent 5062c29
commit 579e35a
Show file tree

Hide file tree

Showing 8 changed files with 56 additions and 2 deletions.
diff --git a/etc/user.php b/etc/user.php
@@ -23,7 +23,7 @@
         'entity' => User::class,
 
         'srp' => [
-            'enabled' => true,
+            'enabled' => false,
             'prime' => null,
             'generator' => null,
             'key' => null,

diff --git a/src/Entity/Article.php b/src/Entity/Article.php
@@ -24,6 +24,7 @@
 use Windwalker\ORM\Cast\JsonCast;
 use Windwalker\ORM\EntityInterface;
 use Windwalker\ORM\EntityTrait;
+use Windwalker\ORM\Event\BeforeStoreEvent;
 use Windwalker\ORM\Metadata\EntityMetadata;
 
 /**
@@ -109,6 +110,14 @@ public static function setup(EntityMetadata $metadata): void
             ->targetTo(Category::class, category_id: 'id');
     }
 
+    #[BeforeStoreEvent]
+    public static function beforeStore(BeforeStoreEvent $event): void
+    {
+        $data = &$event->getData();
+
+        $data['language'] = $data['language'] ?? null ?: '*';
+    }
+
     /**
      * @return int|null
      */

diff --git a/src/Entity/Category.php b/src/Entity/Category.php
@@ -22,6 +22,7 @@
 use Windwalker\ORM\Attributes\PK;
 use Windwalker\ORM\Attributes\Watch;
 use Windwalker\ORM\Cast\JsonCast;
+use Windwalker\ORM\Event\BeforeStoreEvent;
 use Windwalker\ORM\Event\WatchEvent;
 use Windwalker\ORM\Metadata\EntityMetadata;
 use Windwalker\ORM\Nested\NestedPathableInterface;
@@ -91,6 +92,14 @@ public static function setup(EntityMetadata $metadata): void
         //
     }
 
+    #[BeforeStoreEvent]
+    public static function beforeStore(BeforeStoreEvent $event): void
+    {
+        $data = &$event->getData();
+
+        $data['language'] = $data['language'] ?? null ?: '*';
+    }
+
     /**
      * @return int|null
      */

diff --git a/src/Entity/Menu.php b/src/Entity/Menu.php
@@ -21,6 +21,7 @@
 use Windwalker\ORM\Attributes\NestedSet;
 use Windwalker\ORM\Attributes\PK;
 use Windwalker\ORM\Cast\JsonCast;
+use Windwalker\ORM\Event\BeforeStoreEvent;
 use Windwalker\ORM\Metadata\EntityMetadata;
 use Windwalker\ORM\Nested\NestedEntityInterface;
 use Windwalker\ORM\Nested\NestedEntityTrait;
@@ -100,6 +101,14 @@ public static function setup(EntityMetadata $metadata): void
         //
     }
 
+    #[BeforeStoreEvent]
+    public static function beforeStore(BeforeStoreEvent $event): void
+    {
+        $data = &$event->getData();
+
+        $data['language'] = $data['language'] ?? null ?: '*';
+    }
+
     /**
      * @inheritDoc
      */

diff --git a/src/Entity/Page.php b/src/Entity/Page.php
@@ -24,6 +24,7 @@
 use Windwalker\ORM\Cast\JsonCast;
 use Windwalker\ORM\EntityInterface;
 use Windwalker\ORM\EntityTrait;
+use Windwalker\ORM\Event\BeforeStoreEvent;
 use Windwalker\ORM\Metadata\EntityMetadata;
 
 /**
@@ -104,6 +105,14 @@ public static function setup(EntityMetadata $metadata): void
         //
     }
 
+    #[BeforeStoreEvent]
+    public static function beforeStore(BeforeStoreEvent $event): void
+    {
+        $data = &$event->getData();
+
+        $data['language'] = $data['language'] ?? null ?: '*';
+    }
+
     public function getId(): ?int
     {
         return $this->id;

diff --git a/src/Entity/Tag.php b/src/Entity/Tag.php
@@ -24,6 +24,7 @@
 use Windwalker\ORM\EntityInterface;
 use Windwalker\ORM\EntityTrait;
 use Windwalker\ORM\Event\AfterDeleteEvent;
+use Windwalker\ORM\Event\BeforeStoreEvent;
 use Windwalker\ORM\Metadata\EntityMetadata;
 
 /**
@@ -81,6 +82,14 @@ public static function setup(EntityMetadata $metadata): void
         //
     }
 
+    #[BeforeStoreEvent]
+    public static function beforeStore(BeforeStoreEvent $event): void
+    {
+        $data = &$event->getData();
+
+        $data['language'] = $data['language'] ?? null ?: '*';
+    }
+
     #[AfterDeleteEvent]
     public static function afterDelete(AfterDeleteEvent $event): void
     {

diff --git a/src/Entity/Widget.php b/src/Entity/Widget.php
@@ -21,6 +21,7 @@
 use Windwalker\ORM\Cast\JsonCast;
 use Windwalker\ORM\EntityInterface;
 use Windwalker\ORM\EntityTrait;
+use Windwalker\ORM\Event\BeforeStoreEvent;
 use Windwalker\ORM\Metadata\EntityMetadata;
 
 /**
@@ -89,6 +90,14 @@ public static function setup(EntityMetadata $metadata): void
         //
     }
 
+    #[BeforeStoreEvent]
+    public static function beforeStore(BeforeStoreEvent $event): void
+    {
+        $data = &$event->getData();
+
+        $data['language'] = $data['language'] ?? null ?: '*';
+    }
+
     public function getId(): ?int
     {
         return $this->id;

diff --git a/src/Module/Front/Page/PageView.php b/src/Module/Front/Page/PageView.php
@@ -110,7 +110,7 @@ public function prepare(AppContext $app, View $view): array
             $conditions = ['alias' => $path];
 
             if ($this->isLocaleEnabled()) {
-                $conditions['language'] = $this->getLocale();
+                $conditions['language'] = [$this->getLocale(), '*'];
             }
 
             $page = $this->orm->mapper(Page::class)->mustFindOne($conditions);