added a way to manipulate validator attribute names

snipe · Oct 1, 2024 · 4f9f035 · 4f9f035
1 parent cd3059f
commit 4f9f035
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/app/Http/Controllers/AssetModelsController.php b/app/Http/Controllers/AssetModelsController.php
@@ -483,7 +483,12 @@ private function assignCustomFieldsDefaultValues(AssetModel|SnipeModel $model, a
             $rules[$field] = $validation;
         }
 
-        $validator = Validator::make($data, $rules);
+        $attributes = [];
+        foreach ($model->fieldset->fields as $field) {
+            $attributes[$field->db_column] = trim(preg_replace('/_+|snipeit|\d+/', ' ', $field->db_column));
+        }
+
+        $validator = Validator::make($data, $rules)->setAttributeNames($attributes);
 
         if($validator->fails()){
             $this->validatorErrors = $validator->errors();

diff --git a/resources/views/livewire/custom-field-set-default-values-for-model.blade.php b/resources/views/livewire/custom-field-set-default-values-for-model.blade.php
@@ -127,7 +127,6 @@ class="form-control"
                                         <?php
                                         $errormessage = $errors->first($field->db_column_name());
                                         if ($errormessage) {
-                                            $errormessage = preg_replace('/snipeit|\d+/', '', $errormessage);
                                             print('<span class="alert-msg" aria-hidden="true"><i class="fas fa-times" aria-hidden="true"></i> '.$errormessage.'</span>');
                                         }
                                         ?>