diff options
| author | Igor Scheller <igor.scheller@igorshp.de> | 2019-10-21 09:12:10 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-10-21 09:12:10 +0200 |
| commit | 9b08b951a2f7036519a9711ff4aa32a8709e261d (patch) | |
| tree | d3e42cbb043a854c11f11e735447bebb302f9d43 /includes/model/Shifts_model.php | |
| parent | 4e65e6f73ae13d5d833e37f5a841c375cdde9530 (diff) | |
| parent | 52b8b6b45c68dff281e101bc27375347f296ba5e (diff) | |
Merge pull request #651 from MyIgel/shift-deletion-worklog
Save time of past shifts as worklog if they get deleted
Diffstat (limited to 'includes/model/Shifts_model.php')
| -rw-r--r-- | includes/model/Shifts_model.php | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/includes/model/Shifts_model.php b/includes/model/Shifts_model.php index 6bb17cf2..01295fbc 100644 --- a/includes/model/Shifts_model.php +++ b/includes/model/Shifts_model.php @@ -80,12 +80,15 @@ function Shifts_from_frab() } /** - * @param array $room + * @param array|int $room * @return array[] */ function Shifts_by_room($room) { - return DB::select('SELECT * FROM `Shifts` WHERE `RID`=? ORDER BY `start`', [$room['RID']]); + return DB::select( + 'SELECT * FROM `Shifts` WHERE `RID`=? ORDER BY `start`', + [is_array($room) ? $room['RID'] : $room] + ); } /** @@ -508,8 +511,8 @@ function Shift_delete_by_psid($shift_psid) */ function Shift_delete($shift_id) { - DB::delete('DELETE FROM `Shifts` WHERE `SID`=?', [$shift_id]); mail_shift_delete(Shift($shift_id)); + DB::delete('DELETE FROM `Shifts` WHERE `SID`=?', [$shift_id]); } /** |