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 track groups #4052

Merged
merged 12 commits into from
Sep 18, 2019
Merged

Add track groups #4052

merged 12 commits into from
Sep 18, 2019

Conversation

panagiotappl
Copy link
Member

@panagiotappl panagiotappl commented Sep 3, 2019

closes #3433

indico/legacy/pdfinterface/conference.py Outdated Show resolved Hide resolved
indico/legacy/pdfinterface/conference.py Outdated Show resolved Hide resolved
indico/modules/events/tracks/client/js/index.js Outdated Show resolved Hide resolved
indico/modules/events/tracks/controllers.py Outdated Show resolved Hide resolved
indico/modules/events/tracks/controllers.py Outdated Show resolved Hide resolved
indico/web/client/styles/modules/_tracks.scss Outdated Show resolved Hide resolved
indico/web/client/styles/modules/_tracks.scss Outdated Show resolved Hide resolved
indico/web/client/styles/modules/_tracks.scss Outdated Show resolved Hide resolved
indico/web/client/styles/modules/_tracks.scss Outdated Show resolved Hide resolved
indico/web/client/styles/modules/_tracks.scss Outdated Show resolved Hide resolved
@panagiotappl panagiotappl force-pushed the track-groups branch 6 times, most recently from 9380659 to 66fc43d Compare September 6, 2019 07:58
indico/web/client/styles/modules/_tracks.scss Outdated Show resolved Hide resolved
indico/web/client/styles/modules/_tracks.scss Outdated Show resolved Hide resolved
indico/modules/events/tracks/client/js/index.js Outdated Show resolved Hide resolved
indico/modules/events/tracks/client/js/index.js Outdated Show resolved Hide resolved
indico/modules/events/tracks/client/js/index.js Outdated Show resolved Hide resolved
indico/modules/events/tracks/client/js/index.js Outdated Show resolved Hide resolved
indico/modules/events/tracks/client/js/index.js Outdated Show resolved Hide resolved
indico/modules/events/tracks/client/js/index.js Outdated Show resolved Hide resolved
indico/modules/events/tracks/client/js/index.js Outdated Show resolved Hide resolved
indico/modules/events/tracks/client/js/index.js Outdated Show resolved Hide resolved
indico/modules/events/tracks/templates/_track_list.html Outdated Show resolved Hide resolved
indico/modules/events/tracks/templates/_track_list.html Outdated Show resolved Hide resolved
indico/modules/events/tracks/templates/_track_list.html Outdated Show resolved Hide resolved
indico/modules/events/tracks/templates/_track_list.html Outdated Show resolved Hide resolved
indico/modules/events/tracks/client/js/index.js Outdated Show resolved Hide resolved
indico/modules/events/tracks/controllers.py Outdated Show resolved Hide resolved
indico/modules/events/tracks/controllers.py Outdated Show resolved Hide resolved
indico/modules/events/tracks/models/groups.py Outdated Show resolved Hide resolved
indico/modules/events/tracks/templates/_track_list.html Outdated Show resolved Hide resolved
indico/modules/events/tracks/templates/_track_list.html Outdated Show resolved Hide resolved
@panagiotappl panagiotappl force-pushed the track-groups branch 3 times, most recently from 3ad5aa5 to 1aaed2e Compare September 18, 2019 11:35
@@ -699,6 +701,12 @@ def get_contribution(self, id_):
"""Get a contribution of the event"""
return get_related_object(self, 'contributions', {'id': id_})

def get_sorted_tracks(self):
"""Returns tracks and track groups in the correct sort order"""
Copy link
Member

Choose a reason for hiding this comment

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

Return tracks and track groups in the correct order

@ThiefMaster ThiefMaster changed the title Track groups (Front-end) Add track groups Sep 18, 2019
@ThiefMaster ThiefMaster merged commit 5b20215 into indico:master Sep 18, 2019
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.

Implement "Track Groups" (backend)
3 participants