Skip to content

OrderingFilter adjustements#3983

Merged
lovelydinosaur merged 2 commits intoencode:masterfrom
charettes:ordering-filter-adjustements
Apr 8, 2016
Merged

OrderingFilter adjustements#3983
lovelydinosaur merged 2 commits intoencode:masterfrom
charettes:ordering-filter-adjustements

Conversation

@charettes
Copy link
Copy Markdown
Contributor

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
Copy Markdown
Contributor

LGTM

@lovelydinosaur
Copy link
Copy Markdown
Contributor

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
Copy Markdown
Contributor

xordoquy commented Apr 8, 2016

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

@lovelydinosaur lovelydinosaur merged commit d87f2bc into encode:master Apr 8, 2016
@lovelydinosaur lovelydinosaur modified the milestones: 3.3.4 Release, 3.4.0 Release Apr 8, 2016
@lovelydinosaur
Copy link
Copy Markdown
Contributor

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.

4 participants