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

Track order #1576

Merged
merged 5 commits into from Sep 13, 2023
Merged

Track order #1576

merged 5 commits into from Sep 13, 2023

Conversation

johanvdw
Copy link
Contributor

@johanvdw johanvdw commented Sep 11, 2023

This PR close #1305. It gives a position to tracks to make sure their ordering is consistent in dropdowns when entering a CfP and in the online schedule.

I've tested this locally and adjusted a copy of the room unit tests for tracks.
There is no unit test for the order in online schedule.

Screenshots (if appropriate):

(eg, I moved the Rust track to the top)
image

image

Checklist

  • My code follows the code style of this project.
  • My change requires a change to the documentation.
  • I have updated the documentation accordingly.
  • I have added tests to cover my changes.
  • All new and existing tests passed: A few tests did not pass locally, but that seems unrelated to these changes
  • My change is listed in the CHANGELOG.rst if appropriate.

Copy link
Member

@rixx rixx left a comment

Choose a reason for hiding this comment

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

Thank you, this looks great! Could you look into the failing tests, please?

@johanvdw johanvdw requested a review from rixx September 12, 2023 11:24
Copy link
Member

@rixx rixx left a comment

Choose a reason for hiding this comment

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

Thank you so much! I'll make some minor changes after the merge – just to let you know, nothing you were expected to do!

  • I'll remove position.help_text, as we never use that field explicitly, and it's more work for the translators. I'll move Room.position.help_text etc at the same time
  • For the same reason, I'll change the translation strings to "Move up" and "Move down", as there's no real value in specifying the object type each time and it adds more translations
  • I'll add the feature to the changelog

@rixx rixx merged commit f611121 into pretalx:main Sep 13, 2023
12 of 14 checks passed
rixx added a commit that referenced this pull request Sep 13, 2023
We never show the field as such in any form, so we don't need verbose
name and help_text. We can also reuse the "Move up" and "Move down"
translation rather than creating a new one every time. Ref #1576
rixx added a commit that referenced this pull request Sep 13, 2023
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.

Order of tracks changes after editing a track
2 participants