mirror of
https://github.com/FH-Complete/FHC-Core.git
synced 2026-07-24 02:12:17 +00:00
BUG: add fix for room deletion with attached sub rooms
This commit is contained in:
@@ -454,7 +454,7 @@ class Ort extends FHCAPI_Controller
|
||||
|
||||
$reservationsCount = hasData($reservationsResult) ? getData($reservationsResult)[0]->count : 0;
|
||||
if ($reservationsCount > 0) {
|
||||
$this->terminateWithError("Cannot delete room with shortcode $ort_kurzbz because there are existing reservations for this room", self::ERROR_TYPE_GENERAL);
|
||||
$this->terminateWithError($this->p->t('ui', 'error_existingReservationsForRoomsUponDeletion'), self::ERROR_TYPE_GENERAL);
|
||||
}
|
||||
|
||||
$softwareImageOrtQuery = "SELECT COUNT(*) FROM extension.tbl_softwareimage_ort WHERE ort_kurzbz = ?";
|
||||
@@ -465,7 +465,14 @@ class Ort extends FHCAPI_Controller
|
||||
|
||||
$softwareImageOrtCount = $softwareImageOrtResult->row()->count;
|
||||
if ($softwareImageOrtCount > 0) {
|
||||
$this->terminateWithError($this->p->t('ui', 'error_existingReservationsForRoomsUponDeletion'), self::ERROR_TYPE_GENERAL);
|
||||
$this->terminateWithError($this->p->t('ui', 'error_existingSoftwareImageForRoomTypeUponDeletion'), self::ERROR_TYPE_GENERAL);
|
||||
}
|
||||
|
||||
$subRoomsCountQuery = "SELECT COUNT(*) FROM public.tbl_ort WHERE parent_ort_kurzbz = ?";
|
||||
$subRoomsCountQuery = $this->OrtModel->execReadOnlyQuery($subRoomsCountQuery, [$ort_kurzbz]);
|
||||
$subRoomsCount = hasData($subRoomsCountQuery) ? getData($subRoomsCountQuery)[0]->count : 0;
|
||||
if ($subRoomsCount > 0) {
|
||||
$this->terminateWithError($this->p->t('ui', 'error_existingSubRoomsForRoomUponDeletion'), self::ERROR_TYPE_GENERAL);
|
||||
}
|
||||
|
||||
$result = $this->OrtModel->delete([
|
||||
|
||||
Reference in New Issue
Block a user