wip

Author: iamgergo

src/Fields/Relation.php

@@ -661,8 +661,8 @@ public function mapRelated(Request $request, Model $model, Model $related): arra
     {
         return [
             'id' => $related->getKey(),
-            'url' => $this->relatedUrl($model, $related),
             'model' => $related->setRelation('related', $model),
+            'url' => $this->relatedUrl($related),
             'fields' => $this->resolveFields($request)
                 ->subResource(false)
                 ->authorized($request, $related)
@@ -683,9 +683,9 @@ public function modelUrl(Model $model): string
     /**
      * Get the related URL.
      */
-    public function relatedUrl(Model $model, Model $related): string
+    public function relatedUrl(Model $related): string
     {
-        return sprintf('%s/%s', $this->modelUrl($model), $related->getKey());
+        return sprintf('%s/%s', $this->modelUrl($related->getRelationValue('related')), $related->getKey());
     }
 
     /**
@@ -1007,7 +1007,7 @@ public function toShow(Request $request, Model $model, Model $related): array
             'template' => 'root::resources.show',
             'title' => $this->resolveDisplay($related),
             'model' => $related->setRelation('related', $model),
-            'action' => $this->relatedUrl($model, $related),
+            'action' => $this->relatedUrl($related),
             'fields' => $this->resolveFields($request)
                 ->subResource(false)
                 ->authorized($request, $related)
@@ -1034,7 +1034,7 @@ public function toEdit(Request $request, Model $model, Model $related): array
             'template' => 'root::resources.form',
             'title' => __('Edit :model', ['model' => $this->resolveDisplay($related)]),
             'model' => $related->setRelation('related', $model),
-            'action' => $this->relatedUrl($model, $related),
+            'action' => $this->relatedUrl($related),
             'method' => 'PATCH',
             'uploads' => $this->hasFileField($request),
             'fields' => $this->resolveFields($request)

src/Http/Controllers/BelongsToManyController.php

@@ -31,7 +31,7 @@ public function store(Request $request, Model $model): RedirectResponse
 
         $field->handleFormRequest($request, $pivot);
 
-        return Redirect::to($field->relatedUrl($model, $pivot))
+        return Redirect::to($field->relatedUrl($pivot))
             ->with('alerts.relation-created', Alert::success(__('The relation has been created!')));
     }
 
@@ -46,9 +46,11 @@ public function update(Request $request, Model $model, Model $related): Redirect
 
         $pivot = $related->getRelation($relation->getPivotAccessor());
 
+        $pivot->setRelation('related', $related);
+
         $field->handleFormRequest($request, $pivot);
 
-        return Redirect::to($field->relatedUrl($model, $pivot))
+        return Redirect::to($field->relatedUrl($pivot))
             ->with('alerts.relation-updated', Alert::success(__('The relation has been updated!')));
     }
 

src/Http/Controllers/RelationController.php

@@ -57,7 +57,7 @@ public function store(Request $request, Model $model): RedirectResponse
 
         $field->handleFormRequest($request, $related);
 
-        return Redirect::to($field->relatedUrl($model, $related))
+        return Redirect::to($field->relatedUrl($related))
             ->with('alerts.relation-created', Alert::success(__('The relation has been created!')));
     }
 
@@ -103,7 +103,7 @@ public function update(Request $request, Model $model, Model $related): Redirect
 
         $field->handleFormRequest($request, $related);
 
-        return Redirect::to($field->relatedUrl($model, $related))
+        return Redirect::to($field->relatedUrl($related))
             ->with('alerts.relation-updated', Alert::success(__('The relation has been updated!')));
     }