Markus Törnqvist
2795e842d6
Two test cases for html rendering of API with labelized model
2013-05-18 17:44:40 +03:00
Markus Törnqvist
e68ea16d7a
Update FieldLabelTest to use new BasicModel.verbose_name
2013-05-18 17:43:47 +03:00
Markus Törnqvist
e2a5ec0350
Change BasicModel.verbose_name
...
Isn't it nicer to test for a text which is different from
what the previous broken behavior was? Now we can really
tell it works!
2013-05-18 17:42:56 +03:00
Markus Törnqvist
e2d3aa65d7
Move and rename LabelModelSerializer for further reuse
2013-05-18 16:56:26 +03:00
Markus Törnqvist
e7ddaf5472
Turns out label and help_text are not always there
2013-05-18 16:50:59 +03:00
Markus Törnqvist
1343398868
Renderer uses form field's label and help, not attribute name
2013-05-18 15:15:02 +03:00
Markus Törnqvist
764299843c
ManyHyperlinkedRelatedField comes form rest_framework.relations now
2013-05-18 13:30:39 +03:00
Markus Törnqvist
3691cd2ffd
Use smart_text() instead of nonexistant smart_unicode()
2013-05-18 13:26:59 +03:00
Markus Törnqvist
85faebbb75
Merge branch 'mikee2185-master' into mjtorn-master
...
Conflicts:
rest_framework/fields.py
rest_framework/serializers.py
rest_framework/tests/models.py
rest_framework/tests/serializer.py
Fixed all the conflicts.
2013-05-18 13:24:36 +03:00
Tom Christie
b950b025bc
Merge pull request #850 from tomchristie/dynamic-forms
...
Forms in Broseable API support dynamic serializers based on request method
2013-05-18 01:49:38 -07: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
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
Tom Christie
2dd48fbb05
Merge pull request #847 from johtso/patch-1
...
Fix typo + grammar in viewsets docs
2013-05-17 07:08:58 -07:00
Johannes
df11198c6c
Fix typo + grammar in viewsets docs
2013-05-17 12:27:48 +02:00
Michael Elovskikh
646b3b266d
Updated README.md
2013-05-16 22:32:32 -07:00
Tom Christie
f1fb434e6d
Update release-notes.md
2013-05-16 19:59:33 +02:00
Tom Christie
bc3dfca5e3
Added @rouge8 for bugfix #844 . Thank you!
2013-05-16 19:58:17 +02:00
Tom Christie
4ade7fb82c
Merge pull request #844 from rouge8/hyperlinkedidentityfield-lookup_field
...
HyperlinkedIdentityField uses `lookup_field` kwarg.
2013-05-16 10:56:12 -07: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
0e81ffced2
Merge branch 'master' of https://github.com/tomchristie/django-rest-framework
2013-05-16 15:25:04 +01:00
Tom Christie
aff88d15f7
Version 2.3.3
2013-05-16 15:08:12 +01:00
Tom Christie
1a4e99e892
Merge pull request #843 from linovia/master
...
Small typo in the ViewSet example.
2013-05-16 01:12:18 -07:00
Xavier Ordoquy
66aa2f7a16
Small typo in the ViewSet example.
2013-05-16 09:47:22 +02: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
599c0eb0db
Added @jsummerfield for cleanups in #824 . Thanks!
2013-05-14 19:38:41 +02: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
d199a89c18
Merge branch 'master' of https://github.com/tomchristie/django-rest-framework
2013-05-14 11:40:43 +01:00
Tom Christie
6487fa535b
Added @avinash240 for bugfix #822
2013-05-14 11:39:30 +01:00
Tom Christie
727a64f3b9
Updated release notes
2013-05-14 11:38: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
Tom Christie
aa0dcd2e4a
More docs on SearchFilter
2013-05-14 10:16:00 +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
Tom Christie
f9aeb68383
Updated release notes
2013-05-14 09:59:29 +01:00
Tom Christie
1154d873e9
Added django-viewsets to credits. Refs #738 .
2013-05-13 13:35:16 +02: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
