allow admin to sign up more angels than needed again
This commit is contained in:
parent
f687076507
commit
582c429fd4
|
@ -251,20 +251,20 @@ function user_shifts() {
|
||||||
WHERE `start` < '" . sql_escape($shift['end']) . "' AND `end` > '" . sql_escape($shift['start']) . "'") > 0) {
|
WHERE `start` < '" . sql_escape($shift['end']) . "' AND `end` > '" . sql_escape($shift['start']) . "'") > 0) {
|
||||||
error(_("You already subscribed to shift in the same timeslot. Please contact a dispatcher to join the shift."));
|
error(_("You already subscribed to shift in the same timeslot. Please contact a dispatcher to join the shift."));
|
||||||
redirect(shift_link($shift));
|
redirect(shift_link($shift));
|
||||||
|
|
||||||
|
$needed_angeltypes = NeededAngelTypes_by_shift($shift['SID']);
|
||||||
|
if ($needed_angeltypes === false)
|
||||||
|
engelsystem_error('Unable to load needed angel types.');
|
||||||
|
|
||||||
|
// you canot join if shift is full
|
||||||
|
foreach ($needed_angeltypes as $needed_angeltype)
|
||||||
|
if ($needed_angeltype['angel_type_id'] == $type_id)
|
||||||
|
if ($needed_angeltype['taken'] >= $needed_angeltype['count']) {
|
||||||
|
error(_("The shift is already full."));
|
||||||
|
redirect(shift_link($shift));
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
$needed_angeltypes = NeededAngelTypes_by_shift($shift['SID']);
|
|
||||||
if ($needed_angeltypes === false)
|
|
||||||
engelsystem_error('Unable to load needed angel types.');
|
|
||||||
|
|
||||||
// you canot join if shift is full
|
|
||||||
foreach ($needed_angeltypes as $needed_angeltype)
|
|
||||||
if ($needed_angeltype['angel_type_id'] == $type_id)
|
|
||||||
if ($needed_angeltype['taken'] >= $needed_angeltype['count']) {
|
|
||||||
error(_("The shift is already full."));
|
|
||||||
redirect(shift_link($shift));
|
|
||||||
}
|
|
||||||
|
|
||||||
if (in_array('user_shifts_admin', $privileges))
|
if (in_array('user_shifts_admin', $privileges))
|
||||||
$type = sql_select("SELECT * FROM `AngelTypes` WHERE `id`=" . sql_escape($type_id) . " LIMIT 1");
|
$type = sql_select("SELECT * FROM `AngelTypes` WHERE `id`=" . sql_escape($type_id) . " LIMIT 1");
|
||||||
else
|
else
|
||||||
|
|
Loading…
Reference in New Issue