fix: [eventReport:edit] Editing event via /events/edit should work as expected

- Correct call to editReport
- Force local ID to match provided UUID
pull/6916/head
mokaddem 2021-01-26 11:46:13 +01:00
parent d9afc70760
commit b86c58c8ae
No known key found for this signature in database
GPG Key ID: 164C473F627A06FA
2 changed files with 3 additions and 1 deletions

View File

@ -4092,7 +4092,7 @@ class Event extends AppModel
if (isset($data['Event']['EventReport'])) {
foreach ($data['Event']['EventReport'] as $i => $report) {
$nothingToChange = false;
$result = $this->EventReport->editReport($user, $report, $this->id, true, $nothingToChange);
$result = $this->EventReport->editReport($user, ['EventReport' => $report], $this->id, true, $nothingToChange);
if (!empty($result)) {
$validationErrors['EventReport'][] = $result;
}

View File

@ -161,6 +161,8 @@ class EventReport extends AppModel
$errors[] = __('Event Report not found.');
return $errors;
}
} else {
$report['EventReport']['id'] = $existingReport['EventReport']['id'];
}
if ($fromPull) {