Ryan Kaskel
ef383d969c
Clean up test case.
2013-05-18 14:31:29 +01:00
Ryan Kaskel
22874e441d
Merge latest changes from master.
2013-05-18 14:17:50 +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
2a3056d038
Merge pull request #851 from linovia/master
...
Updated the dependencies version and added the ALLOWED_HOSTS for tests.
2013-05-18 03:40:38 -07:00
Pablo Recio
de5cc8de42
A model's field is required if is null or blank
2013-05-18 12:40:25 +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
Xavier Ordoquy
ed0bd195f5
Updated the dependencies version and added the ALLOWED_HOSTS for tests.
2013-05-18 12:07:44 +02:00
Tom Christie
aea040161a
Forms in Broseable API support dynamic serializers based on request method
2013-05-18 09:36:09 +01:00
Craig de Stigter
c56d5f8f63
Merge remote-tracking branch 'upstream/master'
2013-05-18 10:23:26 +02:00
Tom Christie
34776da924
Minor mixin refactoring
2013-05-17 22:09:23 +01:00
Tom Christie
b6fb377c2b
Fix PendingDeprecation warnings in tests
2013-05-17 21:57:11 +01:00
Tom Christie
14ded26167
PendingDeprecation warning to allow_empty
2013-05-17 21:28:33 +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
aff88d15f7
Version 2.3.3
2013-05-16 15:08:12 +01:00
Tom Christie
af88a5b175
Test and fix which closes #652 .
2013-05-15 14:25:25 +01:00
Tom Christie
092d5223eb
Fix searchfilter issues
2013-05-15 10:29:51 +01:00
Tom Christie
2f54decd3e
Merge branch 'master' of https://github.com/tomchristie/django-rest-framework
2013-05-14 21:41:39 +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
dd3c434f6c
Merge pull request #824 from jsummerfield/patch-1
...
Remove trailing unmatched </div> in login_base.html template. Reformat i...
2013-05-14 10:36:31 -07:00
Tom Christie
d62414147f
Fix assert messaging on fields/exclude checking. Closes #833
2013-05-14 17:53:37 +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
Tom Christie
b2bf5f1f88
SearchFilter may be comma and/or whitespace seperated
2013-05-14 10:10:44 +01:00
Tom Christie
752c01420f
Fix Django 1.3 compat with routers
2013-05-14 10:01:05 +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
James Summerfield
5074bbe4b2
Remove trailing unmatched </div> in login_base.html template. Reformat indentation and label all closing tags for consistency.
2013-05-13 07:51:23 +02: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
fd4a66cfc7
Fix py3k compat with functools.reduce
2013-05-10 23:06:42 +01:00
Tom Christie
dd51d369c8
Unicode string fix
2013-05-10 23:02:24 +01:00
Tom Christie
293dc3e6d8
Added SearchFilter
2013-05-10 22:33:11 +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
0176a5391b
Fix HyperlinkedModelSerializer not respecting lookup_fields
2013-05-09 17:09:40 +01:00
Tom Christie
939cc5adba
Tweak inheritance
2013-05-09 13:35:01 +01:00
Tom Christie
31f94ab409
Added GenericViewSet and docs tweaking
2013-05-09 13:31:42 +01:00
Tom Christie
4ab7b8f257
Version 2.3.2
2013-05-08 20:49:49 +01:00
Tom Christie
b443560080
Fix DATETIME_FORMAT, DATE_FORMAT, TIME_FORMAT settings. Closes #798
2013-05-08 20:38:50 +01:00
Tom Christie
de69a28b9e
Test and fix for #814 .
2013-05-08 20:18:01 +01:00
Tom Christie
429e078eee
Allow None filename on uploaded files
2013-05-08 20:07:51 +01:00
