アクセスルールグループ編集画面で、urlのフィールドが提供されていない場合のテストを追加

baserproject · Feb 27, 2024 · bf0dd9a · bf0dd9a
1 parent ca955f1
commit bf0dd9a
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 2 deletions.
diff --git a/plugins/baser-core/src/Model/Table/PermissionsTable.php b/plugins/baser-core/src/Model/Table/PermissionsTable.php
@@ -158,8 +158,9 @@ public function validationPlain($validator)
     public function beforeSave(EventInterface $event, EntityInterface $entity, ArrayObject $options)
     {
         $data = $event->getData();
-        if (preg_match('/^[^\/]/is', $data["entity"]->get("url"))) {
-            $data["entity"]->set("url", '/' . $data["entity"]->get("url"));
+        $url = $data["entity"]->get("url");
+        if ($url && preg_match('/^[^\/]/is', $url)) {
+            $data["entity"]->set("url", '/' . $url);
         }
         return true;
     }

diff --git a/plugins/baser-core/tests/Scenario/PermissionGroupsScenario.php b/plugins/baser-core/tests/Scenario/PermissionGroupsScenario.php
@@ -53,6 +53,7 @@ public function load(...$args)
         ])->persist();
 
         PermissionFactory::make([
+            'id' => 1,
             'no' => 1,
             'sort' => 1,
             'name' => 'システム管理',
@@ -67,6 +68,7 @@ public function load(...$args)
         ])->persist();
 
         PermissionFactory::make([
+            'id' => 2,
             'no' => 1,
             'sort' => 1,
             'name' => 'よく使う項目',
@@ -81,6 +83,7 @@ public function load(...$args)
         ])->persist();
 
         PermissionFactory::make([
+            'id' => 3,
             'no' => 1,
             'sort' => 1,
             'name' => 'ページ管理',

diff --git a/plugins/baser-core/tests/TestCase/Controller/Admin/PermissionGroupsControllerTest.php b/plugins/baser-core/tests/TestCase/Controller/Admin/PermissionGroupsControllerTest.php
@@ -107,6 +107,14 @@ public function test_edit()
         $this->loadFixtureScenario(PermissionGroupsScenario::class);
         $data = [
             'name' => 'システム基本設定　Update',
+            'permissions' => [[
+                'id' => "1",
+                'name' => "一覧",
+                'user_group_id' => "2",
+                'method' => "GET",
+                'auth' => "1",
+                'status' => "1"
+            ]]
         ];
         $this->post('/baser/admin/baser-core/permission_groups/edit/1/1', $data);
         //メッセージを確認