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

OrderingFilter adjustements #3983

Merged
merged 2 commits into from Apr 8, 2016

Conversation

charettes
Copy link
Contributor

@charettes charettes commented Mar 10, 2016

Description

Two small changes to the OrderingFilter's browsable API display.

  1. Always use Field.verbose_name when __all__ is specified as Field.label doesn't exist;
  2. Marked the ordering labels ('ascending', 'descending') for translation.

@xordoquy xordoquy added this to the 3.4.0 Release milestone Mar 10, 2016
@jpadilla
Copy link
Member

jpadilla commented Mar 25, 2016

LGTM

@tomchristie
Copy link
Member

tomchristie commented Apr 8, 2016

Yup I'm happy with this too.
@xordoquy - I've gotten a bit lost wrt branch strategy atm, help me out here? :)

@xordoquy
Copy link
Collaborator

xordoquy commented Apr 8, 2016

@tomchristie let's just do as usual for now.

@tomchristie tomchristie merged commit d87f2bc into encode:master Apr 8, 2016
2 checks passed
@tomchristie tomchristie modified the milestones: 3.3.4 Release, 3.4.0 Release Apr 8, 2016
@tomchristie
Copy link
Member

tomchristie commented Apr 8, 2016

Okay.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants