Karol Majta
5bebd29f11
Merge branch 'master' of git://github.com/tomchristie/django-rest-framework
2013-05-18 16:56:38 +02:00
Karol Majta
ebe959b52a
charset param gets now appended to response's Content-Type. Closes #807
2013-05-18 16:45:05 +02:00
Tom Christie
3f47eb7a77
Merge pull request #861 from minddust/fix_missing_field_values
...
Remove default values - django sets them for us - cause of #710
2013-05-18 07:32:50 -07:00
Stephan Groß
6714b755f4
Fix missing para..
2013-05-18 16:32:31 +02:00
Stephan Groß
aeea32030b
Add newline
2013-05-18 16:27:11 +02:00
Stephan Groß
9f9cb97d65
Add TestCases for default field values
2013-05-18 16:24:54 +02:00
Tom Christie
e1a3cab400
Merge pull request #854 from ryankask/issue-775
...
All relations pointing to ManyToManyFields should default to read-only
2013-05-18 07:22:22 -07:00
Tom Christie
cc39b9c925
Merge pull request #858 from minddust/fix_710
...
Fix for #710
2013-05-18 07:19:52 -07:00
Pablo Recio
7dca0e6859
Removed unicode literals
2013-05-18 16:12:48 +02:00
Pablo Recio
50ba26822d
Merge branch 'master' into 675-empty-label-related-field
2013-05-18 16:11:06 +02:00
Tom Christie
ea9a3d88bc
Merge pull request #859 from craigds/master
...
fix for #765
2013-05-18 07:06:21 -07:00
Stephan Groß
eb9fdd04fc
Remove unused var
2013-05-18 15:50:12 +02:00
Stephan Groß
e6409bbc83
Temp commit for branch change ;-)
2013-05-18 15:48:36 +02:00
Craig de Stigter
208bd991da
when source='*' on a nested serializer, expand fields into outer serializer when writing. fixes #765
2013-05-18 15:23:43 +02:00
Stephan Groß
a71acc76d8
Fix for #710
2013-05-18 15:12:54 +02:00
Ryan Kaskel
0b84c5a0ac
Merge latest changes from master.
2013-05-18 14:04:27 +01:00
Pablo Recio
392c8556ae
Display an empty label into related fields if it isn't required
2013-05-18 15:01:58 +02:00
Ryan Kaskel
770ed3de2e
ToMany fields default to read-only if targeting ManyToManyField.
2013-05-18 13:11:40 +01:00
Tom Christie
6d425aa3be
Merge pull request #831 from brianz/master
...
Allow nested fields to be missing
2013-05-18 04:36:00 -07:00
Pablo Recio
8fe43236a2
Moved test model into closer to the testcase
2013-05-18 13:23:38 +02:00
Pablo Recio
53a8004401
Merge branch 'master' into 725-blank-choice-dash
...
Conflicts:
rest_framework/tests/fields.py
2013-05-18 12:51:40 +02:00
Pablo Recio
ab8bd566f9
Adding BLANK_CHOICE_DASH as a choice if the model's field isn't required
2013-05-18 12:41:52 +02:00
Tom Christie
9fe6a103ec
Merge pull request #694 from craigds/master
...
fix function names and dotted lookups for use in PrimaryKeyRelatedField
2013-05-18 03:38:36 -07:00
Craig de Stigter
c992b600f7
add tests for dotted lookup in RelatedField, PrimaryKeyRelatedField, and HyperlinkedRelatedField. #694
2013-05-18 12:32:48 +02:00
Tom Christie
a73c16b85f
serializers.Field respects ordering on dicts if it exists. Closes #832
2013-05-18 11:27:48 +01:00
Craig de Stigter
930bd4d0e1
add tests for related field source for HyperlinkedRelatedField. #694
2013-05-18 12:23:12 +02:00
Craig de Stigter
0cd7c80e6e
add tests for related field source for RelatedField and PrimaryKeyRelatedField. #694
2013-05-18 12:16:30 +02:00
Tom Christie
aea040161a
Forms in Broseable API support dynamic serializers based on request method
2013-05-18 09:36:09 +01:00
Tom Christie
b6fb377c2b
Fix PendingDeprecation warnings in tests
2013-05-17 21:57:11 +01:00
Andy Freeland
abe207b869
HyperlinkedIdentityField uses lookup_field kwarg.
...
According to the [Serializers API Guide][1], `HyperlinkedIdentityField`
takes `lookup_field` as a kwarg like the other related fields and the
generic views. However, this was not actually implemented.
[1]: http://django-rest-framework.org/api-guide/serializers.html#hyperlinkedmodelserializer
2013-05-16 11:48:35 -04:00
Tom Christie
af88a5b175
Test and fix which closes #652 .
2013-05-15 14:25:25 +01:00
Tom Christie
e939e1755a
Base automatic filterset model on the queryset model. Fixes #834 .
2013-05-14 21:40:55 +01:00
Tom Christie
a303d0f38c
Fix filter test renaming
2013-05-14 11:37:59 +01:00
Tom Christie
ce1a04a603
Merge branch 'master' of https://github.com/avinash240/django-rest-framework
2013-05-14 11:34:47 +01:00
Tom Christie
2cff6e69db
Added OrderingFilter
2013-05-14 11:27:08 +01:00
Tom Christie
6a037f63ed
Added OrderingFilter
2013-05-14 11:27:03 +01:00
Tom Christie
08bc976269
Rename filter tests
2013-05-14 10:16:46 +01:00
Brian Zambrano
24c9c455fe
Allow for missing non-required nested objects.
...
Serializer fields which are themselves serializers should not be required.
Specifically, if a nested object is set to "required=False", it should be
possible to serialize the main object and have the sub-object set to None/null.
2013-05-13 14:41:12 -07:00
Marlon Bailey
5e2d8052d4
fix test case to work with Python 3 and make it more explicit
2013-05-12 09:22:14 -04:00
Marlon Bailey
9d2580dccf
added support for multiple @action and @link decorators on a viewset, along with a router testcase illustrating the failure against the master code base
2013-05-11 22:26:34 -04:00
Tom Christie
dd51d369c8
Unicode string fix
2013-05-10 23:02:24 +01:00
Tom Christie
8ce36d2bf1
SearchFilter and tests
2013-05-10 21:57:20 +01:00
Tom Christie
773a92eab3
Move models into test modules, out of models module
2013-05-10 21:57:05 +01:00
Tom Christie
de69a28b9e
Test and fix for #814 .
2013-05-08 20:18:01 +01:00
Tom Christie
642970a1b8
Merge pull request #806 from wronglink/master
...
Added FileUploadParser
2013-05-07 05:09:09 -07:00
Tom Christie
b70c9cc107
Merge master
2013-05-05 18:12:35 +01:00
Michael Elovskikh
e36e4f48ad
Codebase improvements on FileUploadParser
...
* Added docstrings.
* Added `FileUploadParser.get_filename` to make it easier to override.
* Added url kwargs filename detection step.
* Updated tests corresponding to these changes.
2013-05-04 14:58:21 +06:00
Michael Elovskikh
318fdaabe5
Tests for FileUploadParser
2013-05-03 01:39:08 +06:00
Victor Shih
8cabae22c5
Example and spelling fixes. Change "browseable" to "browsable" for consistency.
2013-05-01 21:26:40 -07:00
Tom Christie
22af28d146
Merge master
2013-04-30 19:32:34 +01:00
