Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/Http/Controllers/Actions/FetchMany.php
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,6 @@ public function index(Route $route, StoreContract $store)
$response = $this->searched($data, $request);
}

return $response ?: new DataResponse($data);
return $response ?: (new DataResponse($data))->withRequest($request);
}
}
2 changes: 1 addition & 1 deletion src/Http/Controllers/Actions/FetchOne.php
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,6 @@ public function show(Route $route, StoreContract $store)
$response = $this->read($model, $request);
}

return $response ?: new DataResponse($model);
return $response ?: (new DataResponse($model))->withRequest($request);
}
}
2 changes: 1 addition & 1 deletion src/Http/Controllers/Actions/Store.php
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,6 @@ public function store(Route $route, StoreContract $store)
$response = $this->saved($model, $request, $query);
}

return $response ?: new DataResponse($model);
return $response ?: (new DataResponse($model))->withRequest($query);
}
}
2 changes: 1 addition & 1 deletion src/Http/Controllers/Actions/Update.php
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,6 @@ public function update(Route $route, StoreContract $store)
$response = $this->saved($model, $request, $query);
}

return $response ?: new DataResponse($model);
return $response ?: (new DataResponse($model))->withRequest($query);
}
}
7 changes: 6 additions & 1 deletion src/Http/Requests/ResourceQuery.php
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,11 @@ class ResourceQuery extends FormRequest implements QueryParameters
self::JSON_API_MEDIA_TYPE,
];

/**
* @var string[]|null
*/
protected ?array $defaultIncludePaths = null;

/**
* Specify the callback to use to guess the request class for querying many resources.
*
Expand Down Expand Up @@ -149,7 +154,7 @@ public function includePaths(): ?IncludePaths
return IncludePaths::fromString($data['include'] ?: '');
}

return null;
return IncludePaths::nullable($this->defaultIncludePaths);
}

/**
Expand Down