Merge pull request #5589 from Laravel-Backpack/fix-validation

Fix validation `$attributes` getting values from wrong variable
Laravel-Backpack · Aug 1, 2024 · 3c867c2 · 3c867c2
2 parents 6b9c540 + a477fc0
commit 3c867c2
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 1 deletion.
diff --git a/src/app/Library/CrudPanel/Traits/Validation.php b/src/app/Library/CrudPanel/Traits/Validation.php
@@ -163,7 +163,7 @@ public function mergeRequestAndFieldRules($request, $rules = null, $messages = n
     {
         $rules = $rules ?? $this->getOperationSetting('validationRules') ?? [];
         $messages = $messages ?? $this->getOperationSetting('validationMessages') ?? [];
-        $attributes = $messages ?? $this->getOperationSetting('validationAttributes') ?? [];
+        $attributes = $attributes ?? $this->getOperationSetting('validationAttributes') ?? [];
 
         $request = (new $request)->createFrom($this->getRequest());
         $extendedRules = $this->mergeRules($request, $rules);

diff --git a/tests/Unit/CrudPanel/CrudPanelValidationTest.php b/tests/Unit/CrudPanel/CrudPanelValidationTest.php
@@ -69,6 +69,35 @@ public function testItMergesFieldValidationWithRequestValidation()
         $this->assertEquals(['email'], array_keys($this->crudPanel->getOperationSetting('validationRules')));
     }
 
+    public function testItCanGetTheValidationAttributesFromFields()
+    {
+        $this->crudPanel->addField([
+            'name' => 'email',
+            'validationAttribute' => 'emailed',
+        ]);
+
+        $this->crudPanel->setValidation();
+
+        $this->assertEquals(['email' => 'emailed'], $this->crudPanel->getOperationSetting('validationAttributes'));
+    }
+
+    public function testItCanGetTheValidationAttributesFromSubfields()
+    {
+        $this->crudPanel->addField([
+            'name' => 'email',
+            'subfields' => [
+                [
+                    'name' => 'test',
+                    'validationAttribute' => 'emailed',
+                ],
+            ],
+        ]);
+
+        $this->crudPanel->setValidation();
+
+        $this->assertEquals(['email.*.test' => 'emailed'], $this->crudPanel->getOperationSetting('validationAttributes'));
+    }
+
     public function testItMergesAllKindsOfValidation()
     {
         $this->crudPanel->setModel(User::class);