iger
/
engelsystem
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix wrong nick and api sql query

This commit is contained in:
Philip Häusler 2014-09-06 15:02:54 +02:00
parent 2716c63648
commit 4414358cf5
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
includes/controller/user_angeltypes_controller.php
View File

@ -213,7 +213,7 @@ function user_angeltype_delete_controller() {
return array( return array(
_("Remove angeltype"), _("Remove angeltype"),
UserAngelType_delete_view($user_angeltype, $user, $angeltype) UserAngelType_delete_view($user_angeltype, $user_source, $angeltype)
); );
} }

3
includes/model/NeededAngelTypes_model.php
View File

@ -23,7 +23,8 @@ function NeededAngelTypes_by_shift($shiftId) {
SELECT `NeededAngelTypes`.*, `AngelTypes`.`name`, `AngelTypes`.`restricted` SELECT `NeededAngelTypes`.*, `AngelTypes`.`name`, `AngelTypes`.`restricted`
FROM `NeededAngelTypes` FROM `NeededAngelTypes`
JOIN `AngelTypes` ON `AngelTypes`.`id` = `NeededAngelTypes`.`angel_type_id` JOIN `AngelTypes` ON `AngelTypes`.`id` = `NeededAngelTypes`.`angel_type_id`
WHERE `room_id`=" . sql_escape($shiftId) . " JOIN `Shifts` ON `Shifts`.`RID` = `NeededAngelTypes`.`room_id`
WHERE `Shifts`.`SID`=" . sql_escape($shiftId) . "
AND `count` > 0 AND `count` > 0
ORDER BY `room_id` DESC ORDER BY `room_id` DESC
"); ");