progress, going to sleep

snipe · Feb 14, 2024 · 2524154 · 2524154
1 parent 57a75e6
commit 2524154
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 12 deletions.
diff --git a/app/Http/Controllers/AssetModelsController.php b/app/Http/Controllers/AssetModelsController.php
@@ -7,6 +7,7 @@
 use App\Models\Actionlog;
 use App\Models\Asset;
 use App\Models\AssetModel;
+use App\Models\CustomField;
 use App\Models\User;
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\DB;
@@ -169,6 +170,7 @@ public function update(ImageUploadRequest $request, $modelId = null)
 
  if ($this->shouldAddDefaultValues($request->input())) {
  if (!$this->assignCustomFieldsDefaultValues($model, $request->input('default_values'))){
+ //TODO: this needs to return the actual validation errors, will come back to this before opening PR
  return redirect()->back()->withInput()->with('error', trans('admin/custom_fields/message.fieldset_default_value.error'));
  }
  }
@@ -489,11 +491,11 @@ private function shouldAddDefaultValues(array $input)
  * @param array $defaultValues
  * @return void
  */
- private function assignCustomFieldsDefaultValues(AssetModel $model, array $defaultValues)
+ private function assignCustomFieldsDefaultValues(AssetModel $model, array $defaultValues): bool
  {
  $data = array();
  foreach ($defaultValues as $customFieldId => $defaultValue) {
- $customField = \App\Models\CustomField::find($customFieldId);
+ $customField = CustomField::find($customFieldId);
 
  $data[$customField->db_column] = $defaultValue;
  }

diff --git a/app/Models/CustomFieldset.php b/app/Models/CustomFieldset.php
@@ -102,7 +102,7 @@ public function validation_rules()
  if ($field->element == 'checkbox') {
  //Log::alert($field->formatFieldValuesAsArray());
  $values = $field->formatFieldValuesAsArray();
- $rules[$field->db_column_name()] = 'checkboxes';
+ $rules[$field->db_column_name()][] = 'checkboxes';
  }
  }
 

diff --git a/app/Providers/ValidationServiceProvider.php b/app/Providers/ValidationServiceProvider.php
@@ -297,23 +297,24 @@ public function boot()
  return !is_array($value);
  });
 
+ // This is only used in Models/CustomFieldset.php - it does automatic validation for checkboxes by making sure
+ // that the submitted values actually exist in the options.
  Validator::extend('checkboxes', function ($attribute, $value, $parameters, $validator){
  $options = CustomField::where('db_column', $attribute)->first()->formatFieldValuesAsArray();
+ if(is_array($value)) {
+ $invalid = array_diff($value, $options);
+ if(count($invalid) > 0) {
+ return false;
+ }
+ }
  // for legacy, allows users to submit a comma separated string of options
- if(!is_array($value)) {
+ elseif(!is_array($value)) {
  $exploded = explode(',', $value);
  $invalid = array_diff($exploded, $options);
  if(count($invalid) > 0) {
  return false;
  }
- } else {
- $valid = array_intersect($value, $options);
- if(array_count_values($valid) > 0) {
- return true;
- }
- }
-
-
+ } else return true;
  });
  }