Fixed fillAttributeFromRequest and compiled js fields (#10)

royduin · Jan 21, 2021 · 9584127 · 9584127
1 parent 6068993
commit 9584127
Show file tree

Hide file tree

Showing 2 changed files with 28,302 additions and 32 deletions.
diff --git a/dist/js/field.js b/dist/js/field.js
diff --git a/src/DynamicSelect.php b/src/DynamicSelect.php
@@ -2,10 +2,12 @@
 
 namespace Hubertnnn\LaravelNova\Fields\DynamicSelect;
 
+use RuntimeException;
 use Hubertnnn\LaravelNova\Fields\DynamicSelect\Traits\DependsOnAnotherField;
 use Hubertnnn\LaravelNova\Fields\DynamicSelect\Traits\HasDynamicOptions;
 use Illuminate\Http\Request;
 use Laravel\Nova\Fields\Field;
+use Laravel\Nova\Http\Requests\NovaRequest;
 
 class DynamicSelect extends Field
 {
@@ -34,49 +36,50 @@ public function belongsToMany($resourceClass)
     {
         $model = $resourceClass::$model;
         $primaryKey = (new $model)->getKeyName();
+        $this->multiselect = true;
 
-        $this->resolveUsing(function ($value) use ($primaryKey, $resourceClass) {
-            $value = collect($value)->map(function ($option) use ($primaryKey) {
-                return [
-                    'label' => $option->{$this->labelKey ?: 'name'},
-                    'value' => $option->{$primaryKey},
-                ];
-            });
+        if ($this->multiselect) {
+            $this->resolveUsing(function ($value) use ($primaryKey, $resourceClass) {
+                $value = collect($value)->map(function ($option) use ($primaryKey) {
+                    return [
+                        'label' => $option->{$this->labelKey ?: 'name'},
+                        'value' => $option->{$primaryKey},
+                    ];
+                });
 
-            return $value;
-        });
+                return $value;
+            });
 
-        $this->fillUsing(function ($request, $model, $requestAttribute, $attribute) {
-            $model::saved(function ($model) use ($attribute, $request) {
-                // Validate
-                if (!method_exists($model, $attribute)) {
-                    throw new RuntimeException("{$model}::{$attribute} must be a relation method.");
-                }
+            $this->fillUsing(function ($request, $model, $requestAttribute, $attribute) {
+                $model::saved(function ($model) use ($requestAttribute, $request) {
+                    // Validate
+                    if (!method_exists($model, $requestAttribute)) {
+                        throw new RuntimeException("{$model}::{$requestAttribute} must be a relation method.");
+                    }
 
-                $relation = $model->{$attribute}();
+                    $relation = $model->{$requestAttribute}();
 
-                if (!method_exists($relation, 'sync')) {
-                    throw new RuntimeException("{$model}::{$attribute} does not appear to model a BelongsToMany or MorphsToMany.");
-                }
+                    if (!method_exists($relation, 'sync')) {
+                        throw new RuntimeException("{$model}::{$requestAttribute} does not appear to model a BelongsToMany or MorphsToMany.");
+                    }
 
-                $values = collect($request->get($attribute))
-                    ->filter(function ($v) {
-                        return $v;
-                    })
-                    ->map(function ($v) {
-                        return json_decode($v)->value;
-                    })->toArray();
+                    $values = collect($request->get($requestAttribute))
+                        ->filter(function ($v) {
+                            return $v;
+                        })->map(function ($v) {
+                            return json_decode($v)->value;
+                        })->toArray();
 
-                // Sync
-                $relation->sync($values ?? []);
+                    // Sync
+                    $relation->sync($values ?? []);
+                });
             });
-        });
-
-        $this->multiselect = true;
+        }
 
         return $this;
     }
 
+
     protected function fillAttributeFromRequest(Request $request, $requestAttribute, $model, $attribute)
     {
         if ($this->multiselect) {
@@ -89,6 +92,8 @@ protected function fillAttributeFromRequest(Request $request, $requestAttribute,
 
                 $model->{$attribute} = $values;
             }
+        } else {
+            $model->{$attribute} = $value;
         }
     }