fixes
This commit is contained in:
parent
caa699ff05
commit
ea9aa9ef40
|
@ -92,7 +92,10 @@ class ImportSchedule extends BaseController
|
||||||
{
|
{
|
||||||
$scheduleId = $request->getAttribute('schedule_id'); // optional
|
$scheduleId = $request->getAttribute('schedule_id'); // optional
|
||||||
|
|
||||||
$schedule = ScheduleUrl::findOrFail($scheduleId);
|
$schedule = ScheduleUrl::find($scheduleId);
|
||||||
|
if ($schedule == null) {
|
||||||
|
$schedule = new ScheduleUrl();
|
||||||
|
}
|
||||||
|
|
||||||
return $this->response->withView(
|
return $this->response->withView(
|
||||||
'admin/schedule/edit.twig',
|
'admin/schedule/edit.twig',
|
||||||
|
@ -421,6 +424,7 @@ class ImportSchedule extends BaseController
|
||||||
$scheduleShift = ScheduleShift::whereGuid($event->getGuid())->where('schedule_id', $schedule->id)->first();
|
$scheduleShift = ScheduleShift::whereGuid($event->getGuid())->where('schedule_id', $schedule->id)->first();
|
||||||
$shift = $scheduleShift->shift;
|
$shift = $scheduleShift->shift;
|
||||||
$shift->delete();
|
$shift->delete();
|
||||||
|
$scheduleShift->delete();
|
||||||
|
|
||||||
$this->fireDeleteShiftEntryEvents($event, $schedule);
|
$this->fireDeleteShiftEntryEvents($event, $schedule);
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue