Skip to content

Commit 5c1c671

Browse files
committed
Revert "Fix bug in menu item form"
This reverts commit 9bd2421 + fix form edit save by always setting an empty label.
1 parent c98fe4b commit 5c1c671

File tree

4 files changed

+10
-7
lines changed

4 files changed

+10
-7
lines changed

resources/lang/en/filament-flexible-content-block-pages.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,6 @@
153153
'link_type_help' => 'Choose what this menu item should link to.',
154154
'label_lbl' => 'Label',
155155
'label_help' => 'The text displayed for this menu item.',
156-
'label_disabled_help' => 'Label field is disabled because the model title itself will be used.',
157156
'use_model_title_lbl' => 'Use model title',
158157
'use_model_title_help' => 'Use the title from the linked model instead of custom label.',
159158
'linkable_item_lbl' => 'Select item',

resources/lang/nl/filament-flexible-content-block-pages.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,6 @@
153153
'link_type_help' => 'Kies waarnaar dit menu-item moet linken.',
154154
'label_lbl' => 'Label',
155155
'label_help' => 'De tekst die wordt weergegeven voor dit menu-item.',
156-
'label_disabled_help' => 'Het label veld is uitgeschakeld omdat de titel van het model zelf wordt gebruikt.',
157156
'use_model_title_lbl' => 'Gebruik model titel',
158157
'use_model_title_help' => 'Gebruik de titel van het gekoppelde model in plaats van een aangepast label.',
159158
'linkable_item_lbl' => 'Selecteer item',

src/Form/Forms/MenuItemForm.php

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -98,10 +98,8 @@ protected static function getLabelField(): TextInput
9898
{
9999
return LabelField::create()
100100
->required(fn (Get $get): bool => ! $get(static::FIELD_USE_MODEL_TITLE))
101-
->disabled(fn (Get $get): bool => $get(static::FIELD_USE_MODEL_TITLE))
102-
->helperText(fn (Get $get): string => $get(static::FIELD_USE_MODEL_TITLE)
103-
? flexiblePagesTrans('menu_items.form.label_disabled_help')
104-
: flexiblePagesTrans('menu_items.form.label_help'));
101+
->visible(fn (Get $get): bool => ! $get(static::FIELD_USE_MODEL_TITLE))
102+
->helperText(flexiblePagesTrans('menu_items.form.label_help'));
105103
}
106104

107105
protected static function getUseModelTitleField(): Toggle

src/Resources/MenuResource/Pages/ManageMenuItems.php

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,14 @@ function ($arguments, $form, $model, MenuItem $record) {
109109

110110
$form->fill($data);
111111
}
112-
),
112+
)
113+
->mutateFormDataBeforeSaveUsing(function ($data) {
114+
if (! isset($data['label'])) {
115+
$data['label'] = null;
116+
}
117+
118+
return $data;
119+
}),
113120
DeleteAction::make(),
114121
];
115122
}

0 commit comments

Comments
 (0)