diff options
| author | msquare <msquare@notrademark.de> | 2016-11-25 13:38:16 +0100 |
|---|---|---|
| committer | msquare <msquare@notrademark.de> | 2016-11-25 13:38:16 +0100 |
| commit | bae3ede662426d362a3b9d33d9124253af7e847b (patch) | |
| tree | e5ece21fc12968f5d40d2ff968fbf70766376e31 /includes/model/Shifts_model.php | |
| parent | a8bcb19eaad798a6441a29e58f9c03ae84de4fc5 (diff) | |
fixes #279 fix exporting freeload comment in json export
Diffstat (limited to 'includes/model/Shifts_model.php')
| -rw-r--r-- | includes/model/Shifts_model.php | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/includes/model/Shifts_model.php b/includes/model/Shifts_model.php index 2db0a3d3..67580eee 100644 --- a/includes/model/Shifts_model.php +++ b/includes/model/Shifts_model.php @@ -263,7 +263,9 @@ function Shift_create($shift) { */ function Shifts_by_user($user) { $result = sql_select(" - SELECT `ShiftTypes`.`id` as `shifttype_id`, `ShiftTypes`.`name`, `ShiftEntry`.*, `Shifts`.*, `Room`.* + SELECT `ShiftTypes`.`id` as `shifttype_id`, `ShiftTypes`.`name`, + `ShiftEntry`.`id`, `ShiftEntry`.`SID`, `ShiftEntry`.`TID`, `ShiftEntry`.`UID`, `ShiftEntry`.`freeloaded`, `ShiftEntry`.`Comment`, + `Shifts`.*, `Room`.* FROM `ShiftEntry` JOIN `Shifts` ON (`ShiftEntry`.`SID` = `Shifts`.`SID`) JOIN `ShiftTypes` ON (`ShiftTypes`.`id` = `Shifts`.`shifttype_id`) |