Skip to content

Commit 8219320

Browse files
authored
Merge pull request #53 from saade/revert-47-fix/allow-form-with-relations
Revert "Allow event's model to have relationship"
2 parents a47bb29 + d62db8b commit 8219320

3 files changed

Lines changed: 6 additions & 15 deletions

File tree

src/Widgets/Concerns/CanManageEvents.php

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -50,17 +50,16 @@ public function onEventClick($event): void
5050
return;
5151
}
5252

53+
$this->editEventForm
54+
->disabled(! static::canEdit($event))
55+
->fill($event);
56+
5357
if (method_exists($this, 'resolveEventRecord')) {
5458
$this->event = $this->resolveEventRecord($event);
55-
$this->editEventForm->model($this->event);
5659
} else {
5760
$this->event_id = $event['id'] ?? null;
5861
}
5962

60-
$this->editEventForm
61-
->disabled(! static::canEdit($event))
62-
->fill($this->event?->getAttributes() ?? $event);
63-
6463
$this->dispatchBrowserEvent('open-modal', ['id' => 'fullcalendar--edit-event-modal']);
6564
}
6665

src/Widgets/Forms/CreateEventForm.php

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,27 +3,21 @@
33
namespace Saade\FilamentFullCalendar\Widgets\Forms;
44

55
use Filament\Forms;
6-
use Illuminate\Database\Eloquent\Model;
76

87
trait CreateEventForm
98
{
109
public $createEventFormState = [];
1110

1211
public function onCreateEventSubmit()
1312
{
14-
$eventModel = $this->createEvent($this->createEventForm->getState());
15-
if ($eventModel) {
16-
$this->createEventForm->model($eventModel);
17-
$this->createEventForm->saveRelationships();
18-
}
13+
$this->createEvent($this->createEventForm->getState());
1914

2015
$this->dispatchBrowserEvent('close-modal', ['id' => 'fullcalendar--create-event-modal']);
2116
}
2217

23-
public function createEvent(array $data): ?Model
18+
public function createEvent(array $data): void
2419
{
2520
// Override this function and do whatever you want with $data
26-
return null;
2721
}
2822

2923
protected static function getCreateEventFormSchema(): array
@@ -42,7 +36,6 @@ protected function getCreateEventForm(): array
4236
{
4337
return [
4438
'createEventForm' => $this->makeForm()
45-
->model($this->getFormModel()::getModel())
4639
->schema(static::getCreateEventFormSchema())
4740
->statePath('createEventFormState'),
4841
];

src/Widgets/Forms/EditEventForm.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@ protected function getEditEventForm(): array
3636
{
3737
return [
3838
'editEventForm' => $this->makeForm()
39-
->model($this->getFormModel())
4039
->schema(static::getEditEventFormSchema())
4140
->statePath('editEventFormState'),
4241
];

0 commit comments

Comments
 (0)