diff options
| author | msquare <msquare@notrademark.de> | 2016-11-15 21:33:54 +0100 |
|---|---|---|
| committer | msquare <msquare@notrademark.de> | 2016-11-15 21:33:54 +0100 |
| commit | 79ca2f177203b9514c8f351eff4e24b6b4996af5 (patch) | |
| tree | b06a4d3c37ae3087fab0d38b3f4156837632b404 /includes/view/Shifts_view.php | |
| parent | 5299ca210319b324564a889dcb2d7b651117f7eb (diff) | |
add fixed shift calendar headers and timelane
Diffstat (limited to 'includes/view/Shifts_view.php')
| -rw-r--r-- | includes/view/Shifts_view.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/includes/view/Shifts_view.php b/includes/view/Shifts_view.php index 7ad580f4..629f6b2a 100644 --- a/includes/view/Shifts_view.php +++ b/includes/view/Shifts_view.php @@ -50,7 +50,7 @@ function Shift_view($shift, $shifttype, $room, $angeltypes_source, $user_shifts, return page_with_title($shift['name'] . ' <small class="moment-countdown" data-timestamp="' . $shift['start'] . '">%c</small>', [ msg(), - Shift_collides($shift, $user_shifts) ? info(_('This shift collides with one of your shifts.'), true) : '', + $shift_signup_state->getState() == ShiftSignupState::COLLIDES ? info(_('This shift collides with one of your shifts.'), true) : '', $shift_signup_state->getState() == ShiftSignupState::SIGNED_UP ? info(_('You are signed up for this shift.'), true) : '', ($shift_admin || $admin_shifttypes || $admin_rooms) ? buttons([ $shift_admin ? button(shift_edit_link($shift), glyph('pencil') . _('edit')) : '', |