Skip to content

Commit

Permalink
fix wrong fields showing up on creation
Browse files Browse the repository at this point in the history
  • Loading branch information
milewski committed Oct 3, 2019
1 parent 881c3b6 commit 79f28ac
Showing 1 changed file with 12 additions and 13 deletions.
25 changes: 12 additions & 13 deletions src/InlineMorphTo.php
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
use Laravel\Nova\Fields\Field;
use Laravel\Nova\Fields\HasMany;
use Laravel\Nova\Fields\HasOne;
use Laravel\Nova\Http\Controllers\CreationFieldController;
use Laravel\Nova\Http\Controllers\ResourceIndexController;
use Laravel\Nova\Http\Controllers\ResourceShowController;
use Laravel\Nova\Http\Controllers\UpdateFieldController;
Expand Down Expand Up @@ -95,21 +96,19 @@ private function resolveFields(Resource $resourceInstance): Collection
$request = app(NovaRequest::class);
$controller = $request->route()->controller;

if ($controller instanceof UpdateFieldController) {
switch (get_class($controller)) {

return $resourceInstance->updateFields($request);
case CreationFieldController::class :
return $resourceInstance->creationFields($request);

}

if ($controller instanceof ResourceShowController) {

return $resourceInstance->detailFields($request);

}
case UpdateFieldController::class :
return $resourceInstance->updateFields($request);

if ($controller instanceof ResourceIndexController) {
case ResourceShowController::class :
return $resourceInstance->detailFields($request);

return $resourceInstance->indexFields($request);
case ResourceIndexController::class :
return $resourceInstance->indexFields($request);

}

Expand Down Expand Up @@ -220,11 +219,11 @@ public function jsonSerialize()
$originalResource = $request->route()->resource;

/**
* Temporarily remap the route resource key so every sub field thinks it's being resolved by it's original parent
* Temporarily remap the route resource key so every sub field thinks its being resolved by its original parent
*/
foreach ($this->meta[ 'resources' ] as $resource) {

$resource[ 'fields' ] = $resource[ 'fields' ]->transform(function (&$field) use ($request, $resource) {
$resource[ 'fields' ] = $resource[ 'fields' ]->transform(function ($field) use ($request, $resource) {

$request->route()->setParameter('resource', $resource[ 'uriKey' ]);

Expand Down

0 comments on commit 79f28ac

Please sign in to comment.