Code

Support grouped choices.#3225

Code

Merged

tomchristie merged 8 commits intomasterencode/django-rest-framework:masterfrom maxpeterson-grouped-choices-fixencode/django-rest-framework:maxpeterson-grouped-choices-fixCopy head branch name to clipboardAug 6, 2015

+267-29

Commits

Commits on Jul 3, 2015

• Add support for grouped choices.

  Show description for 56b3f19
  maxpeterson

  committed
  56b3f19

  Copy full SHA for 56b3f19

• Fix 1.4 tests and make flatten_choice a utility.

  maxpeterson

  committed
  ee2afb8

  Copy full SHA for ee2afb8

Commits on Aug 6, 2015

• Merge branch 'grouped-choices-fix' of https://github.com/maxpeterson/django-rest-framework into maxpeterson-grouped-choices-fix

  tomchristie

  committed
  95a1550

  Copy full SHA for 95a1550

• Support grouped choices

  tomchristie

  committed
  27ac5a3

  Copy full SHA for 27ac5a3

• Added docstring

  tomchristie

  committed
  a6fefe7

  Copy full SHA for a6fefe7

• Use same structure for both .choices and .grouped_choices

  tomchristie

  committed
  4d69286

  Copy full SHA for 4d69286

• Added test_iter_options

  tomchristie

  committed
  24dec32

  Copy full SHA for 24dec32

• Test more types of behavior in test_iter_options

  tomchristie

  committed
  33d6d4a

  Copy full SHA for 33d6d4a