Commit Graph

5948 Commits

Author SHA1 Message Date
Tom Christie 0198bce34f Release 3.2.3 2015-08-24 10:59:52 +01:00
Tom Christie b271946b31 Merge pull request #3321 from tomchristie/empty-charfield-html
Resolve empty HTML charfield behavior.
2015-08-24 10:41:36 +01:00
Tom Christie 9ac646385f Resolve empty HTML charfield behavior. Closes #3318. 2015-08-24 10:13:16 +01:00
Tom Christie 9758838d86 Merge pull request #3320 from jpadilla/master
Bump up maximum supported Django versions
2015-08-22 16:38:40 +01:00
José Padilla 01fa2647c9 Bump up maximum supported Django versions 2015-08-22 08:49:05 -04:00
Tom Christie 8527a2c9d2 Merge pull request #3316 from purple-sunrise/iregexp_search
Regex search option
2015-08-21 17:01:03 +01:00
borzdyko f0782b9451 Doc for regex search filter 2015-08-21 18:26:23 +03:00
borzdyko 21d0e51831 Test for regex search filter 2015-08-21 18:23:39 +03:00
borzdyko 314daaedfa Using https://docs.djangoproject.com/en/1.8/ref/models/querysets/#regex for search filter by starting field with '$' 2015-08-21 18:13:13 +03:00
Tom Christie f601c6c1c3 Merge pull request #3313 from tomchristie/limit-selects
Limit rendering of relational selects to max 1000 items by default.
2015-08-21 11:41:55 +01:00
Tom Christie c271568bf5 Remove erronous checkin 2015-08-21 10:57:46 +01:00
Tom Christie 314c0095aa iter_options function should have no cutoff by deault 2015-08-21 10:56:22 +01:00
Tom Christie 99beeb80e1 No cutoff for default ChoiceField, only for relationships 2015-08-21 10:53:10 +01:00
Tom Christie f4412d0827 Docs for select cutoffs 2015-08-21 10:52:44 +01:00
Tom Christie 490f0c9f34 Merge branch 'callorico-master' 2015-08-20 12:39:25 +01:00
Tom Christie b6c4d8c25a Resolve duplicate error for IPAddressField. Closes #3250. 2015-08-20 12:38:48 +01:00
Tom Christie 0f77c27d34 Merge branch 'master' of https://github.com/callorico/django-rest-framework into callorico-master 2015-08-20 12:30:33 +01:00
Tom Christie 75be91912c Allow AdminRenderer to function when pagination is disabled. Closes #3275. 2015-08-20 12:28:00 +01:00
Tom Christie d86fd67895 Fix display of select multiple HTML fields. Closes #3290. 2015-08-20 12:11:14 +01:00
Tom Christie b4b2dc18fa Clean-up refactoring of SearchFilter implementation 2015-08-20 11:35:32 +01:00
Tom Christie aa4cd7e9d7 Guard against LimitOffsetPagination edge case. Closes #3303. 2015-08-20 10:12:52 +01:00
Tom Christie ed65db367a Merge pull request #3300 from jpadilla/listfield-child
Raise error when `source=` use on a child.
2015-08-19 18:23:14 +01:00
José Padilla 8af366a732 Raise error when `source=` use on a child.
Closes #3292
2015-08-19 12:32:16 -04:00
Tom Christie dd850df1d8 Merge pull request #3299 from kennydude/patch-1
Add import to example for filtering
2015-08-19 15:01:04 +01:00
Joe Simpson a4af8cc623 Add import to example for filtering
`from rest_framework import filters` was missing from one of the examples
2015-08-19 14:44:40 +01:00
Tom Christie 7b0252a91c Merge pull request #3296 from FlorianHoornaar/patch-1
Fix typos in comments
2015-08-19 07:32:14 +01:00
Florian Hoornaar 1b5bc07d4c Fix typos in comments 2015-08-19 03:55:39 +02:00
Tom Christie bed3c45161 Merge pull request #3288 from thedrow/feature/cached-field-root-and-context
Cached the field's root and context property
2015-08-18 10:50:32 +01:00
Omer Katz 792005806b Cached the field's root and context property. 2015-08-18 12:38:13 +03:00
Tom Christie 1b53e804ee 3.2.2 Release 2015-08-13 10:23:22 +01:00
Tom Christie 0e6c467851 Merge pull request #3263 from jgadelange/master
Resolved issue with rendering of nested serializers form when value is None
2015-08-13 10:16:19 +01:00
Tom Christie ff5fdeef73 Merge branch 'master' of github.com:tomchristie/django-rest-framework 2015-08-13 09:56:10 +01:00
Tom Christie 18af181191 Fix boolean checkboxes setting to False. Closes #3258. Closes #2776. 2015-08-13 09:56:03 +01:00
Tom Christie 7bfc147cc2 Merge pull request #3268 from ThaJay/patch-1
Update 2-requests-and-responses.md
2015-08-13 00:06:58 +01:00
ThaJay 76fedcc348 Update 2-requests-and-responses.md
just a small error, the trailing slash in the url should be omitted when adding a .suffix
2015-08-12 19:49:43 +02:00
Jeffrey de Lange f5a9904cc8 Resolved issue with rendering of nested serializers form when value is None 2015-08-11 20:27:41 +02:00
Tom Christie a3e64fbe0d Resolve issue with rendering nested serializer forms with empty values. Closes #3260. 2015-08-11 16:25:02 +01:00
Tom Christie 0df99a6c95 Fix erronous request.files docs, and incorrect request.FILES behavior. Closes #3261. 2015-08-11 16:21:02 +01:00
Tom Christie b7e47e3d67 Merge branch 'master' of github.com:tomchristie/django-rest-framework 2015-08-11 09:24:16 +01:00
Tom Christie 83e49dbe63 Fix checkbox input display. Refs #3258. 2015-08-11 09:23:49 +01:00
Tom Christie 4509dbc24e Merge pull request #3241 from jpadilla/master
Raise error if passed a serializer instance
2015-08-10 17:41:01 +01:00
Tom Christie e0c93c1780 Tweaking display_value docs 2015-08-10 16:37:55 +01:00
Tom Christie 2d5e8dea15 Merge pull request #3255 from jamesbeith/issues/#3254-display-value
Add a method to return the string value used in `choices` of a `RelatedField`
2015-08-10 16:32:29 +01:00
James Beith 5c0a2b79b3 Remove converting a string in to a string
The `display_value` method returns a text type.
2015-08-10 15:33:04 +01:00
James Beith eaf61449a8 Explain use case for `display_value` in docs 2015-08-10 13:02:07 +01:00
James Beith 66ae19229e Add docs for `display_value` 2015-08-10 12:38:27 +01:00
James Beith e9d9cb7011 Add tests for `display_value` 2015-08-10 12:19:46 +01:00
James Beith 2f6e5d0509 Add display value method
Returns the text representation of the instance. Subclasses can override this method to provide a different display value used for populating the `choices` property.
2015-08-10 11:03:57 +01:00
Ryan Kaneshiro bc6bf7236b Add test to repro duplicate validation error
Using the ModelSerializer with a model containing a GenericIPAddressField
produces duplicated validation error messages.
2015-08-07 16:53:43 -07:00
José Padilla 7a0416c50b Raise error if passed a serializer instance 2015-08-07 13:12:37 -04:00