diff options
| author | Igor Scheller <igor.scheller@igorshp.de> | 2019-06-04 20:51:26 +0200 |
|---|---|---|
| committer | msquare <msquare@notrademark.de> | 2019-06-04 21:23:34 +0200 |
| commit | ead56a89fef63745d0e9d3a0b44ef198792c2784 (patch) | |
| tree | f7831e1de0281a553c5f5df8fa0a4e1d156a8f27 | |
| parent | b6eda8dbfc9880239bdc622a0b6988ad0a8ab722 (diff) | |
Only show the shift "Comment" field for own entries
| -rw-r--r-- | includes/pages/user_myshifts.php | 7 | ||||
| -rw-r--r-- | includes/view/ShiftEntry_view.php | 13 | ||||
| -rw-r--r-- | includes/view/Shifts_view.php | 5 |
3 files changed, 18 insertions, 7 deletions
diff --git a/includes/pages/user_myshifts.php b/includes/pages/user_myshifts.php index 9ab86f2a..f962225e 100644 --- a/includes/pages/user_myshifts.php +++ b/includes/pages/user_myshifts.php @@ -87,8 +87,11 @@ function user_myshifts() } } - $comment = strip_request_item_nl('comment'); + $comment = $shift['Comment']; $user_source = User::find($shift['UID']); + if (auth()->user()->id == $user_source->id) { + $comment = strip_request_item_nl('comment'); + } if ($valid) { ShiftEntry_update([ @@ -111,7 +114,7 @@ function user_myshifts() } return ShiftEntry_edit_view( - User_Nick_render($shifts_user), + $shifts_user, date('Y-m-d H:i', $shift['start']) . ', ' . shift_length($shift), $shift['Name'], $shift['name'], diff --git a/includes/view/ShiftEntry_view.php b/includes/view/ShiftEntry_view.php index 26e9896d..689aa25a 100644 --- a/includes/view/ShiftEntry_view.php +++ b/includes/view/ShiftEntry_view.php @@ -154,7 +154,7 @@ function ShiftEntry_create_title() /** * Display form for adding/editing a shift entry. * - * @param string $angel + * @param User $angel * @param string $date * @param string $location * @param string $title @@ -187,15 +187,22 @@ function ShiftEntry_edit_view( ) ]; } + + if ($angel->id == auth()->user()->id) { + $comment = form_textarea('comment', __('Comment (for your eyes only):'), $comment); + } else { + $comment = ''; + } + return page_with_title(__('Edit shift entry'), [ msg(), form([ - form_info(__('Angel:'), $angel), + form_info(__('Angel:'), User_Nick_render($angel)), form_info(__('Date, Duration:'), $date), form_info(__('Location:'), $location), form_info(__('Title:'), $title), form_info(__('Type:'), $type), - form_textarea('comment', __('Comment (for your eyes only):'), $comment), + $comment, join('', $freeload_form), form_submit('submit', __('Save')) ]) diff --git a/includes/view/Shifts_view.php b/includes/view/Shifts_view.php index 4daaec8e..2e7bfa4b 100644 --- a/includes/view/Shifts_view.php +++ b/includes/view/Shifts_view.php @@ -224,9 +224,10 @@ function Shift_view_render_shift_entry($shift_entry, $user_shift_admin, $angelty if ($shift_entry['freeloaded']) { $entry = '<del>' . $entry . '</del>'; } - if ($user_shift_admin || $angeltype_supporter) { + $isUser = $shift_entry['UID'] == auth()->user()->id; + if ($user_shift_admin || $angeltype_supporter || $isUser) { $entry .= ' <div class="btn-group">'; - if ($user_shift_admin) { + if ($user_shift_admin || $isUser) { $entry .= button_glyph( page_link_to('user_myshifts', ['edit' => $shift_entry['id'], 'id' => $shift_entry['UID']]), 'pencil', |