Merge branch 'AguarLincoln-master'

kirschbaum-development · Dec 21, 2023 · a5593f8 · a5593f8
2 parents ae2f026 + 0bcc79c
commit a5593f8
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/src/NovaInlineRelationship.php b/src/NovaInlineRelationship.php
@@ -2,15 +2,14 @@
 
 namespace KirschbaumDevelopment\NovaInlineRelationship;
 
-use stdClass;
 use Carbon\Carbon;
-use App\Nova\Resource;
 use Laravel\Nova\Nova;
 use Illuminate\Support\Arr;
 use Illuminate\Support\Str;
 use Laravel\Nova\Fields\ID;
 use Laravel\Nova\Fields\File;
 use Laravel\Nova\Fields\Field;
+use Laravel\Nova\Support\Fluent;
 use Illuminate\Http\UploadedFile;
 use Illuminate\Support\Collection;
 use Laravel\Nova\ResourceToolElement;
@@ -250,7 +249,7 @@ public function getDuplicateRequest(NovaRequest $request, array $item): NovaInli
      */
     public function getValueFromField(Field $field, NovaInlineRelationshipRequest $request, string $attribute)
     {
-        $temp = new stdClass();
+        $temp = new Fluent;
 
         // Fill Attributes in Field
         $field->fillAttribute($request, $attribute, $temp, $attribute);

diff --git a/src/Observers/NovaInlineRelationshipObserver.php b/src/Observers/NovaInlineRelationshipObserver.php
@@ -4,6 +4,7 @@
 
 use Laravel\Nova\Nova;
 use Illuminate\Database\Eloquent\Model;
+use Laravel\Nova\Http\Requests\NovaRequest;
 use KirschbaumDevelopment\NovaInlineRelationship\Integrations\Integrate;
 use KirschbaumDevelopment\NovaInlineRelationship\NovaInlineRelationship;
 use KirschbaumDevelopment\NovaInlineRelationship\Contracts\RelationshipObservable;
@@ -78,9 +79,9 @@ public function callEvent(Model $model, string $event)
      * @param Model $model
      * @param $relationship
      *
-     * @return RelationshipObservable
+     * @return RelationshipObservable|null
      */
-    public function getRelationshipObserver(Model $model, $relationship): RelationshipObservable
+    public function getRelationshipObserver(Model $model, $relationship): ?RelationshipObservable
     {
         $className = NovaInlineRelationshipHelper::getObserver($model->{$relationship}());
 
@@ -94,7 +95,7 @@ public function getRelationshipObserver(Model $model, $relationship): Relationsh
      */
     protected function getModelRelationships(Model $model)
     {
-        return collect(Nova::newResourceFromModel($model)->fields(request()))
+        return collect(Nova::newResourceFromModel($model)->fields(app(NovaRequest::class)))
             ->flatMap(function ($value) {
                 return Integrate::fields($value);
             })