2025-06-29 10:43:06 +00:00
parent 4e18891afc
commit dffd2698bd
3 changed files with 30 additions and 6 deletions
@@ -119,12 +119,7 @@ class AssetManagementController extends TTCrud
        // Check for conflicting reservations if not forced
        if (empty($post['force'])) {
            $now = time();
            $conflictingReservations = AssetManagementReservationModel::dbSelect("
                SELECT * FROM AssetManagementReservation 
                WHERE assetId = {$post['assetId']} AND startDate <= $now AND (endDate IS NULL OR endDate >= $now)
            ");
            $conflictingReservations = AssetManagementReservationModel::getConflictingReservations($post['assetId']);
            if (!empty($conflictingReservations)) {
                $res = $conflictingReservations[0];
                $user = UserModel::getOne($res->userId);