Skip to content

Beautiful Open-Source Form Builder

Fix removed properties casting

Julien Nahumf0939f3992a3
diff --git a/app/Http/Controllers/Forms/FormController.php b/app/Http/Controllers/Forms/FormController.php
index d51cec1da..2a0fc0cb7 100644
--- a/app/Http/Controllers/Forms/FormController.php
+++ b/app/Http/Controllers/Forms/FormController.php
@@ -37,7 +37,7 @@ class FormController extends Controller
$forms = $workspace->forms()->with(['creator','views','submissions'])
->orderByDesc('updated_at')
->paginate(10)->through(function (Form $form) use ($workspace, $workspaceIsPro){
-
+
// Add attributes for faster loading
$form->extra = (object) [
'loadedWorkspace' => $workspace,
@@ -113,7 +113,7 @@ class FormController extends Controller
->processRequest($request)
->simulateCleaning($form->workspace)
->getData();
-
+
// Set Removed Properties
$formData['removed_properties'] = array_merge($form->removed_properties, collect($form->properties)->filter(function ($field) use ($formData) {
return (!Str::of($field['type'])->startsWith('nf-') && !in_array($field['id'], collect($formData['properties'])->pluck("id")->toArray()));
diff --git a/app/Models/Forms/Form.php b/app/Models/Forms/Form.php
index bf52c0939..2e2ae0de9 100644
--- a/app/Models/Forms/Form.php
+++ b/app/Models/Forms/Form.php
@@ -15,6 +15,7 @@ use Spatie\Sluggable\HasSlug;
use Spatie\Sluggable\SlugOptions;
use Stevebauman\Purify\Facades\Purify;
use Illuminate\Support\Facades\DB;
+use Illuminate\Database\Eloquent\Casts\Attribute;
class Form extends Model
{
@@ -218,9 +219,12 @@ class Form extends Model
return !empty($this->password);
}
- public function getRemovedPropertiesAttribute()
- {
- return $this->attributes['removed_properties'] ?? [];
+ protected function removedProperties(): Attribute {
+ return Attribute::make(
+ get: function ($value) {
+ return $value ? json_decode($value, true) : [];
+ }
+ );
}
/**