Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Link objects to reservation occurrences #6114

Merged
merged 19 commits into from Mar 11, 2024
Merged

Link objects to reservation occurrences #6114

merged 19 commits into from Mar 11, 2024

Conversation

OmeGak
Copy link
Member

@OmeGak OmeGak commented Dec 22, 2023 •
edited

Closes: #6113

@OmeGak OmeGak force-pushed the wip/event-room-bookings branch 3 times, most recently from d171898 to 2a85d16 Compare December 22, 2023 14:26
@OmeGak OmeGak marked this pull request as ready for review January 19, 2024 15:41
@OmeGak OmeGak changed the title Allow events to be linked to room booking occurrences Link objects to reservation occurrences Jan 19, 2024
@OmeGak OmeGak force-pushed the wip/event-room-bookings branch 4 times, most recently from 851b553 to bf29b49 Compare January 19, 2024 20:03
@OmeGak OmeGak force-pushed the wip/event-room-bookings branch 3 times, most recently from 5d046ab to 765bc55 Compare January 23, 2024 18:38
ThiefMaster
ThiefMaster reviewed Jan 23, 2024
View reviewed changes
indico/modules/rb/templates/booking_list.html Outdated Show resolved Hide resolved
indico/migrations/versions/20231222_1408_b37cbc4bb129_link_events_to_reservation_occurrences.py Outdated Show resolved Hide resolved
indico/migrations/versions/20231222_1408_b37cbc4bb129_link_events_to_reservation_occurrences.py Outdated Show resolved Hide resolved
indico/modules/rb/__init__.py
@@ -80,7 +80,7 @@ def _topmenu_items(sender, **kwargs):
@signals.menu.items.connect_via('event-management-sidemenu')
def _sidemenu_items(sender, event, **kwargs):
if config.ENABLE_ROOMBOOKING and event.can_manage(session.user):
yield SideMenuItem('room_booking', _('Room booking'), url_for('rb.event_booking_list', event), 50,
yield SideMenuItem('room_booking', _('Room bookings'), url_for('rb.event_booking_list', event), 50,
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

not sure i like this change. IMHO this is simple about the process of booking rooms. so the title there does not imply single/multiple bookings..

Copy link
Member Author

@OmeGak OmeGak Jan 24, 2024 •
edited

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

My idea was that this view will evolve in a place for managing room bookings associated to the event. When implementing the feature request in #6046, I will most likely suggest adding a way to link existing bookings to the event/sessions from this view. I can further imagine this view to also allow unlinking bookings. Maybe is it premature to change menu entry name?

@OmeGak OmeGak force-pushed the wip/event-room-bookings branch 5 times, most recently from c499244 to fc84e7b Compare January 24, 2024 01:55
@OmeGak
Copy link
Member Author

OmeGak commented Jan 31, 2024 •
edited

I found there's something missing in this PR. Since reservations can now be linked to more than one object, we need to adjust the "This booking is linked to an event:" box.

@OmeGak OmeGak force-pushed the wip/event-room-bookings branch 4 times, most recently from 7b12d17 to 2271e2d Compare February 16, 2024 15:39
@ThiefMaster ThiefMaster force-pushed the wip/event-room-bookings branch 2 times, most recently from 79af480 to b69da3a Compare March 9, 2024 18:43
@ThiefMaster ThiefMaster added alembic Contains database changes and removed alembic Contains database changes labels Mar 9, 2024
@github-actions github-actions bot added the alembic Contains database changes label Mar 10, 2024
OmeGak and others added 18 commits March 10, 2024 22:26
@OmeGak @ThiefMaster
Link objects to reservation occurrences
8117dee
@ThiefMaster
Add missing DB schema changes
b80ad6a
@ThiefMaster
Use proper date format when displaying links
9fe4ae2
@ThiefMaster
Add missing i18n
c1baa87
@ThiefMaster
Fix/improve loading links
7adcf6b 
- do not return all link details in reservation data (this would reveal
  event titles to people without access)
- simplify code to serialize links
@ThiefMaster
Use nicer booking link
62678a7
@ThiefMaster
Fix PropTypes warning
f4ba568
@ThiefMaster
Remove unnecessary data from schema
6ae60a9
@ThiefMaster
Fix invalid closing parenthesis
1cc39eb
@ThiefMaster
Avoid wrapping pending icon
ed3405b
@ThiefMaster
Fix useless query string & add comment
45a00bd
@ThiefMaster
Show links with no access more nicely
f1cd85e
@ThiefMaster
Remove unused property
7e7bcd0 
Even the old `event` one was apparently unused, the new one is even less
likely to be needed. And if we do need it at some point, we can add it
back.
@ThiefMaster
Strike out links for invalid occurrences
60f38ac 
Also limit data in schema to what's actually needed
@ThiefMaster
Only create recurring bookings if needed
8b42e92
@ThiefMaster
Fix engrish
cfa3be9
@ThiefMaster
Fix error when editing booking
2998dae
@ThiefMaster
Remove unused code from BookingObjectLink
8ad8e09
@ThiefMaster ThiefMaster added this to the v3.3 milestone Mar 11, 2024
@ThiefMaster ThiefMaster merged commit 6d03d6d into indico:master Mar 11, 2024
15 checks passed
@OmeGak OmeGak mentioned this pull request Apr 9, 2024
Open
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ThiefMaster ThiefMaster ThiefMaster approved these changes

Assignees
No one assigned
Labels
alembic Contains database changes
Projects
None yet
Milestone
v3.3
Development

Successfully merging this pull request may close these issues.

Allow events to be linked to room booking occurrences
2 participants
@OmeGak @ThiefMaster