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

fix angeltype supporter privilege for signing up users to shift

This commit is contained in:
msquare 2016-12-26 23:47:10 +01:00
parent 827de98256
commit 07a0ed37ec
1 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
includes/model/Shifts_model.php
View File

@ -172,6 +172,18 @@ function Shift_signup_allowed_angel($user, $shift, $angeltype, $user_angeltype,
return new ShiftSignupState(ShiftSignupState::FREE, $free_entries); return new ShiftSignupState(ShiftSignupState::FREE, $free_entries);
} }
/**
* Check if an angeltype supporter can sign up a user to a shift.
*/
function Shift_signup_allowed_angeltype_supporter($shift, $angeltype) {
$free_entries = Shift_free_entries($shift['SID'], $angeltype['id']);
if ($free_entries == 0) {
return new ShiftSignupState(ShiftSignupState::OCCUPIED, $free_entries);
}
return new ShiftSignupState(ShiftSignupState::FREE, $free_entries);
}
/** /**
* Check if an admin can sign up a user to a shift. * Check if an admin can sign up a user to a shift.
* *
@ -208,7 +220,7 @@ function Shift_signup_allowed($signup_user, $shift, $angeltype, $user_angeltype
} }
if (in_array('shiftentry_edit_angeltype_supporter', $privileges) && User_is_AngelType_supporter($user, $angeltype)) { if (in_array('shiftentry_edit_angeltype_supporter', $privileges) && User_is_AngelType_supporter($user, $angeltype)) {
return Shift_signup_allowed_angel($signup_user, $shift, $angeltype, $user_angeltype, $user_shifts, true); return Shift_signup_allowed_angeltype_supporter($shift, $angeltype);
} }
return Shift_signup_allowed_angel($signup_user, $shift, $angeltype, $user_angeltype, $user_shifts, false); return Shift_signup_allowed_angel($signup_user, $shift, $angeltype, $user_angeltype, $user_shifts, false);