Skip to content

Allow managers to add internal notes to room bookings - #5791

Merged
ThiefMaster merged 8 commits into
indico:masterfrom
GovernmentPlates:Internal-Booking-Notes-5746
Aug 21, 2023
Merged

Allow managers to add internal notes to room bookings#5791
ThiefMaster merged 8 commits into
indico:masterfrom
GovernmentPlates:Internal-Booking-Notes-5746

Conversation

@GovernmentPlates

@GovernmentPlates GovernmentPlates commented May 30, 2023 •
edited
Loading

Copy link
Copy Markdown
Member

Closes: #5746

  • UI Mockups created and sent
  • Create migration
  • Add admin setting to toggle internal notes
  • Create, View and Edit internal notes (WIP: edit + fix over with correct perms - not isAdmin -> canManage)
  • Hookup setting w/ frontend
  • Implement canManage perms (+ admin override)
  • Ensure backend (API) returns notes to persons with the appropriate canManage permissions (room owners)
  • Remove notes field from edit logs (API)
  • Cleanup/Refactor
  • Update changelog

@GovernmentPlates GovernmentPlates self-assigned this May 30, 2023
ThiefMaster
ThiefMaster reviewed May 30, 2023
View reviewed changes
Comment thread indico/migrations/versions/20230424_1511_cd7038a37646_add_notes_column_to_room_bookings.py Outdated
Comment thread indico/modules/rb/client/js/common/bookings/BookingDetails.jsx Outdated
Comment thread indico/modules/rb/models/reservations.py Outdated
Comment thread indico/modules/rb/schemas.py Outdated
@GovernmentPlates
GovernmentPlates force-pushed the Internal-Booking-Notes-5746 branch 3 times, most recently from b92341e to fc490b2 Compare June 1, 2023 16:51
@GovernmentPlates
GovernmentPlates force-pushed the Internal-Booking-Notes-5746 branch from 6c8e915 to 3fc3ca7 Compare June 6, 2023 21:41
ThiefMaster
ThiefMaster reviewed Jun 6, 2023
View reviewed changes
Comment thread indico/modules/rb/controllers/backend/bookings.py Outdated
Comment thread indico/modules/rb/client/js/common/bookings/BookingEditForm.jsx Outdated
Comment thread indico/modules/rb/client/js/common/bookings/BookingDetails.jsx Outdated
Comment thread indico/modules/rb/api.py Outdated
Comment thread indico/migrations/versions/20230424_1511_cd7038a37646_add_notes_column_to_room_bookings.py Outdated
Comment thread CHANGES.rst Outdated
@GovernmentPlates
GovernmentPlates marked this pull request as ready for review June 6, 2023 21:42
@ThiefMaster

ThiefMaster commented Jun 6, 2023

Copy link
Copy Markdown
Member

Tip for all those WIP commits: git rebase -i master and mark all but the first commit as fixup instead of pick.
For the first commit, change pick to reword and when you get the second editor, put a nice commit message like "Add internal room booking notes"

@GovernmentPlates
GovernmentPlates force-pushed the Internal-Booking-Notes-5746 branch from 1a0843d to 873d74f Compare June 7, 2023 07:39
@GovernmentPlates GovernmentPlates changed the title Allow administrators to add internal notes to room bookings Allow managers to add internal notes to room bookings Jun 7, 2023
@GovernmentPlates
GovernmentPlates force-pushed the Internal-Booking-Notes-5746 branch from 873d74f to 0ffaf5d Compare June 7, 2023 08:01
tomasr8
tomasr8 reviewed Jun 7, 2023
View reviewed changes
Comment thread indico/migrations/versions/20230424_1511_cd7038a37646_add_notes_column_to_room_bookings.py Outdated
tomasr8
tomasr8 reviewed Jun 7, 2023
View reviewed changes
Comment thread indico/migrations/versions/20230424_1511_cd7038a37646_add_notes_column_to_room_bookings.py Outdated
tomasr8
tomasr8 reviewed Jun 7, 2023
View reviewed changes
Comment thread indico/modules/rb/schemas.py Outdated
tomasr8
tomasr8 reviewed Jun 7, 2023
View reviewed changes
Comment thread indico/modules/rb/models/reservations.py Outdated
@GovernmentPlates
GovernmentPlates force-pushed the Internal-Booking-Notes-5746 branch from 0ffaf5d to 1a0b86c Compare June 7, 2023 10:08
tomasr8
tomasr8 reviewed Jun 7, 2023
View reviewed changes
Comment thread indico/modules/rb/schemas.py Outdated
tomasr8
tomasr8 reviewed Jun 7, 2023
View reviewed changes
Comment thread indico/modules/rb/schemas.py Outdated
@GovernmentPlates
GovernmentPlates force-pushed the Internal-Booking-Notes-5746 branch from 1a0b86c to a211cf6 Compare June 7, 2023 14:56
tomasr8
tomasr8 reviewed Jun 7, 2023
View reviewed changes
Comment thread indico/modules/rb/client/js/modules/bookRoom/BookRoomModal.jsx Outdated
tomasr8
tomasr8 reviewed Jun 7, 2023
View reviewed changes
Comment thread indico/modules/rb/client/js/modules/bookRoom/BookRoomModal.jsx Outdated
@GovernmentPlates
GovernmentPlates force-pushed the Internal-Booking-Notes-5746 branch 2 times, most recently from fe1324a to cef4731 Compare June 7, 2023 15:19
ThiefMaster
ThiefMaster reviewed Jun 13, 2023
View reviewed changes
Comment thread indico/migrations/versions/20230424_1511_cd7038a37646_add_notes_column_to_room_bookings.py Outdated
Comment thread indico/modules/rb/util.py
@GovernmentPlates
GovernmentPlates force-pushed the Internal-Booking-Notes-5746 branch from cef4731 to c83c8af Compare June 15, 2023 09:23
@ThiefMaster ThiefMaster added this to the v3.3 milestone Jun 20, 2023
@ThiefMaster
ThiefMaster force-pushed the Internal-Booking-Notes-5746 branch from dad54cb to d0f2fa3 Compare August 17, 2023 11:04
@ThiefMaster
Fix access check for setting/modifying internal note
6c18c89 
- Do not allow changing it without being a manager
- Do not fail when the note does not exist and the feature is disabled
@ThiefMaster
Correctly handle write access to internal note
189ce81
@ThiefMaster
ThiefMaster force-pushed the Internal-Booking-Notes-5746 branch from b00bb24 to 189ce81 Compare August 21, 2023 14:12
@ThiefMaster
ThiefMaster enabled auto-merge (squash) August 21, 2023 14:29
@ThiefMaster
ThiefMaster merged commit fb8fecd into indico:master Aug 21, 2023
@ThiefMaster
ThiefMaster deleted the Internal-Booking-Notes-5746 branch August 21, 2023 14:33
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@tomasr8 tomasr8 tomasr8 left review comments
@ThiefMaster ThiefMaster ThiefMaster approved these changes

Assignees

@GovernmentPlates GovernmentPlates

Labels

None yet

Projects

None yet

Milestone

v3.3

Development

Successfully merging this pull request may close these issues.

Internal booking notes

3 participants

@GovernmentPlates @ThiefMaster @tomasr8