Skip to content

fix: 未承認の予約を承認したときに予約が見えなくなる不具合が発生していたのを修正 #50

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
RyujiAMANO merged 1 commit into from
Jan 19, 2023
Merged

fix: 未承認の予約を承認したときに予約が見えなくなる不具合が発生していたのを修正 #50

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions Model/Behavior/ReservationPlanGenerationBehavior.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -249,6 +249,8 @@ private function __copyEventData(Model $model, $event, $reservationRruleId, $sta
//セットするようにした。
$model->ReservationEvent->prepareLatestCreatedForIns($eventData, $createdUserWhenUpd);

// $eventDataがprepareLatestCreatedForIns()で変更されるので、再度setする
$model->ReservationEvent->set($eventData);
//子もsave（）で返ってくる。
$eventData = $model->ReservationEvent->save(null, false); //aaaaaaaaaaaaa
if (!$eventData) { //保存のみ
Expand Down
2 changes: 2 additions & 0 deletions Model/Behavior/ReservationUpdatePlanBehavior.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -398,6 +398,8 @@ public function updateDtstartData(Model $model, $planParams, $rruleData, $eventD
//is_active調整処理を行う。（eventDataの値が一部変更されます）
$model->ReservationEvent->prepareActiveForUpd($eventData);

// $eventDataがprepareActiveForUpd()で変更されるので、再度setする
$model->ReservationEvent->set($eventData);
if (!$model->ReservationEvent->save(null,
array(
'validate' => false,
Expand Down