Skip to content

Commit 6605eba

Browse files
committed
fix issue with BelongsTo field, close #16
1 parent d9f6632 commit 6605eba

File tree

2 files changed

+7
-2
lines changed

2 files changed

+7
-2
lines changed

src/ConditionalContainer.php

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@
55
use Illuminate\Database\Eloquent\Model;
66
use Illuminate\Support\Collection;
77
use Illuminate\Support\Str;
8+
use Laravel\Nova\Contracts\RelatableField;
9+
use Laravel\Nova\Fields\BelongsTo;
810
use Laravel\Nova\Fields\Field;
911
use Laravel\Nova\Http\Controllers\ResourceUpdateController;
1012
use Laravel\Nova\Http\Controllers\UpdateFieldController;
@@ -287,6 +289,7 @@ public function resolveDependencyFieldUsingRequest($resource, NovaRequest $reque
287289
if ($field instanceof Field &&
288290
!blank($field->attribute) &&
289291
!$field->isReadonly($request) &&
292+
!$field instanceof RelatableField &&
290293
!$field instanceof \Whitecube\NovaFlexibleContent\Flexible) {
291294

292295
$resource->setAttribute($field->attribute, $field->value);

src/HasConditionalContainer.php

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@
88
use Laravel\Nova\Fields\Field;
99
use Laravel\Nova\Fields\FieldCollection;
1010
use Laravel\Nova\Http\Controllers\ActionController;
11+
use Laravel\Nova\Http\Controllers\AssociatableController;
12+
use Laravel\Nova\Http\Controllers\AttachableController;
1113
use Laravel\Nova\Http\Controllers\CreationFieldController;
1214
use Laravel\Nova\Http\Controllers\FieldController;
1315
use Laravel\Nova\Http\Controllers\MorphableController;
@@ -220,8 +222,8 @@ private function flattenDependencies(NovaRequest $request, array $fields)
220222
* If instance of any associative type flatten out all the fields
221223
*/
222224
if (
223-
// $controller instanceof AssociatableController ||
224-
// $controller instanceof AttachableController ||
225+
$controller instanceof AssociatableController ||
226+
$controller instanceof AttachableController ||
225227
$controller instanceof MorphableController ||
226228
$controller instanceof ResourceAttachController ||
227229
$controller instanceof FieldController) {

0 commit comments

Comments
 (0)