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.

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

Add map URL to events #4402

Merged
merged 1 commit into from Apr 16, 2020
Merged

Conversation

OmeGak
Copy link
Member

@OmeGak OmeGak commented Apr 9, 2020

This allows adding a map URL to an event regardless of room booking being enabled or not. In case the event takes place in a room with with map URL associated, this one overrides it.

UI changes

Screen Shot 2020-04-09 at 18 06 25

Screen Shot 2020-04-09 at 18 06 14

Screen Shot 2020-04-09 at 18 05 52

@OmeGak OmeGak force-pushed the wip/event-map-url branch 2 times, most recently from d8f67fe to 9599750 Compare Apr 9, 2020
CHANGES.rst Outdated Show resolved Hide resolved
indico/modules/events/templates/display/conference.html Outdated Show resolved Hide resolved
indico/modules/events/templates/display/conference.html Outdated Show resolved Hide resolved
@OmeGak OmeGak force-pushed the wip/event-map-url branch 3 times, most recently from aabb4e5 to 390c8a7 Compare Apr 14, 2020
@OmeGak OmeGak force-pushed the wip/event-map-url branch 3 times, most recently from ddeb3c4 to 599cae9 Compare Apr 14, 2020
indico/modules/events/models/events.py Outdated Show resolved Hide resolved
indico/modules/events/operations.py Outdated Show resolved Hide resolved
@OmeGak OmeGak force-pushed the wip/event-map-url branch 2 times, most recently from 4604a42 to f009105 Compare Apr 15, 2020
indico/modules/events/management/forms.py Outdated Show resolved Hide resolved
indico/modules/events/operations.py Outdated Show resolved Hide resolved
@ThiefMaster ThiefMaster requested a review from mic4ael Apr 15, 2020
Copy link
Member

@mic4ael mic4ael left a comment

Should this event.map_url also be copied when cloning an event?

indico/modules/events/management/forms.py Outdated Show resolved Hide resolved
@ThiefMaster
Copy link
Member

ThiefMaster commented Apr 16, 2020

Good point, the own_map_url should be included in the data dict in clone_event!

This allows adding a map URL to an event regardless of room booking
being enabled or not. In case the event takes place in a room with with
map URL associated, this one overrides it.
@ThiefMaster ThiefMaster merged commit 8b3aa3f into indico:master Apr 16, 2020
5 checks passed
@ThiefMaster ThiefMaster deleted the wip/event-map-url branch Apr 16, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants