Oscar Vilaplana
7a5cd090aa
fixed tests, added docs, renamed helper method
2013-05-19 15:45:33 +02:00
Oscar Vilaplana
6bbedfd7ae
fixed merge conflict
2013-05-19 15:18:40 +02:00
Nikolaus Schlemm
31893cff74
* make test assertion more explicit
...
* cleanup
2013-05-19 15:12:01 +02:00
Oscar Vilaplana
e80488b619
Added min_length and max_length
2013-05-19 15:08:41 +02:00
Oscar Vilaplana
edbf65c06e
Removed unused imports
2013-05-19 15:06:24 +02:00
Oscar Vilaplana
696c053f4f
s/Single Character/String/
2013-05-19 15:04:43 +02:00
Nikolaus Schlemm
88c94f3720
Merge remote-tracking branch 'grimborg/issue-192-expose-fields-for-options' into issue-192-expose-fields-for-options
2013-05-19 14:58:11 +02:00
Oscar Vilaplana
f1f5f92d89
Added tests, cleaned up imports
2013-05-19 14:55:46 +02:00
Nikolaus Schlemm
efca5f6fec
use double quotes for docstring instead of single quotes
2013-05-19 14:54:16 +02:00
Nikolaus Schlemm
b07cfdcf54
FIXED TEST FOR: don't expose fields for GET and DELETE - leaving room for parameters like e.g. filter or paginate
2013-05-19 13:54:13 +02:00
Nikolaus Schlemm
5473f60192
Merge remote-tracking branch 'grimborg/issue-192-expose-fields-for-options' into issue-192-expose-fields-for-options
2013-05-19 13:46:17 +02:00
Nikolaus Schlemm
1154c12b33
don't expose fields for GET and DELETE - leaving room for parameters like e.g. filter or paginate
2013-05-19 11:37:12 +02:00
Nikolaus Schlemm
a91841f7fe
WORKAROUND: avoid errors like "AttributeError: 'APIRoot' object has no attribute 'get_serializer'"
2013-05-19 11:29:41 +02:00
Oscar Vilaplana
08e9e2042c
Disabled label and help_text in unit test. We should change the test so
...
that it sets them up.
2013-05-19 11:26:56 +02:00
Oscar Vilaplana
b915c1d4d8
Made field label optional in OPTIONS
2013-05-19 11:15:38 +02:00
Nikolaus Schlemm
c0f3a1c397
Integrated status quo of grimborg's awesome humanize_field() for exposing field metadata via OPTIONS :)
2013-05-19 09:25:02 +02:00
Nikolaus Schlemm
9454e23aa9
Merge branch 'master' of git://github.com/tomchristie/django-rest-framework into issue-192-expose-fields-for-options
2013-05-19 09:02:07 +02:00
Tom Christie
7c945b43f0
Only use object permissions in browsable api form generation if an object exists
2013-05-18 23:52:02 +01:00
Tom Christie
4802177766
Enforce object permissions check when rendering forms in browseable API
2013-05-18 21:19:53 +01:00
Tom Christie
4631b91e14
Fix broken 'binary content' in browseable API
2013-05-18 21:12:44 +01:00
Nikolaus Schlemm
843ae60237
Merge branch 'issue-192-expose-fields-for-options' of git://github.com/grimborg/django-rest-framework into issue-192-expose-fields-for-options
...
Conflicts:
rest_framework/tests/fields.py
2013-05-18 18:34:21 +02:00
Nikolaus Schlemm
7f1cc82f96
added unittests for permission check of exposing actions via OPTIONS
2013-05-18 18:29:51 +02:00
Oscar Vilaplana
fecadacab1
added tests for form
2013-05-18 18:27:53 +02:00
Tom Christie
d4721fc1f7
Correct charset on UnicodeJSONRenderer
2013-05-18 17:25:38 +01:00
Tom Christie
bac4bf6e95
Merge branch 'master' of https://github.com/tomchristie/django-rest-framework
2013-05-18 17:22:27 +01:00
Tom Christie
0d3d66cb02
Added proper charset support
2013-05-18 17:21:43 +01:00
Oscar Vilaplana
4dffcb5d77
Added humanized field names and types
2013-05-18 18:10:17 +02:00
Tom Christie
1888f4a1f0
Merge pull request #865 from ryankask/issue-747-lazy-strings-serialized
...
Issue 747 lazy strings serialized
2013-05-18 09:05:42 -07:00
Ryan Kaskel
579f77ceaa
Move function to compat.
2013-05-18 17:04:17 +01:00
Tom Christie
6d5cf527c3
Merge pull request #864 from minddust/fix_missing_min_values
...
Fix missing min values
2013-05-18 08:56:24 -07:00
Nikolaus Schlemm
5ab7cc6e6b
HEAD and OPTIONS should not be exposed as actions as discussed in a42afa04c3 (commitcomment-3241476)
2013-05-18 17:38:47 +02:00
Markus Törnqvist
99848b0321
Drop another case of u'', this time from #530 code
2013-05-18 18:38:37 +03:00
Markus Törnqvist
1fd66fe8c6
Drop u'', it was used inconsistently and breaks for nothing with Python 3.2
2013-05-18 18:27:36 +03:00
Ryan Kaskel
33f702d306
Merge latest changes from master.
2013-05-18 16:26:17 +01:00
Ryan Kaskel
10e451a85a
Handle Python 3 strings and lazy strings.
2013-05-18 16:21:18 +01:00
Stephan Groß
025c40e7d5
Fix order for applying min_value to fields
2013-05-18 17:16:29 +02:00
Nikolaus Schlemm
b225b1d5c9
Merge branch 'master' of git://github.com/tomchristie/django-rest-framework into issue-192-expose-fields-for-options
2013-05-18 17:13:59 +02:00
Markus Törnqvist
48c1b2233b
Merge branch 'master' into mjtorn-master
...
Conflicts:
rest_framework/serializers.py
rest_framework/tests/serializer.py
Fixed conflicts
2013-05-18 18:13:31 +03:00
Nikolaus Schlemm
a42afa04c3
draft for fields' metadata via OPTIONS - needs review and decision
2013-05-18 17:13:23 +02:00
Nikolaus Schlemm
b4dbfa9832
only catch relevant exceptions ;)
2013-05-18 17:10:13 +02:00
Pablo Recio
b9b2297612
Tests proper encoding in JSONRenderer and UnicodeJSONRenderer
2013-05-18 17:06:54 +02:00
Pablo Recio
6dbbbc16da
Better checking if the content can be printable in the BrowsableAPI
2013-05-18 17:06:54 +02:00
Pablo Recio
97f034e3d6
Adds UnicodeJSONRenderer which doesn't ensure ascii
2013-05-18 17:06:54 +02:00
Pablo Recio
c69f960066
Adding a class attribute into JSONRenderer for ensuring ascii, and using it consistently
2013-05-18 17:06:54 +02:00
Stephan Groß
0c81d04170
Add min_value=0 to autogenerated Pos..IntFields
2013-05-18 17:04:20 +02:00
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
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
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
Tom Christie
5f8d353f0b
Rename has_user_through_model -> has_through_model
2013-05-18 15:25:49 +01: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
Nikolaus Schlemm
f8c1481d4b
expose the fields metadata via OPTIONS as described in https://github.com/tomchristie/django-rest-framework/issues/192
...
missing:
- get fields for method (currently all the same)
- tests
- right placement of code
2013-05-18 16:21:25 +02:00
Tom Christie
cc39b9c925
Merge pull request #858 from minddust/fix_710
...
Fix for #710
2013-05-18 07:19:52 -07:00
Tom Christie
e32a6e4211
Merge pull request #860 from andymckay/master
...
startswith can take a tuple
2013-05-18 07:17:13 -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
Andy McKay
aeba5bed05
startswith can take a tuple
2013-05-18 07:09:24 -07:00
Stephan Groß
b7176065a9
Update getattr
2013-05-18 16:06:30 +02:00
Tom Christie
ea9a3d88bc
Merge pull request #859 from craigds/master
...
fix for #765
2013-05-18 07:06:21 -07:00
Markus Törnqvist
e2d3aa65d7
Move and rename LabelModelSerializer for further reuse
2013-05-18 16:56:26 +03:00
Tom Christie
80a2600891
Styling tweaks
2013-05-18 14:55:48 +01:00
Markus Törnqvist
e7ddaf5472
Turns out label and help_text are not always there
2013-05-18 16:50:59 +03: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
Ryan Kaskel
ef383d969c
Clean up test case.
2013-05-18 14:31:29 +01: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
Ryan Kaskel
22874e441d
Merge latest changes from master.
2013-05-18 14:17:50 +01: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
Markus Törnqvist
1343398868
Renderer uses form field's label and help, not attribute name
2013-05-18 15:15:02 +03:00
Mark McArdle
50a8f114fc
Merge branch 'master' of git://github.com/tomchristie/django-rest-framework
2013-05-18 13:12:30 +01:00
Ryan Kaskel
770ed3de2e
ToMany fields default to read-only if targeting ManyToManyField.
2013-05-18 13:11:40 +01:00
Mark McArdle
611919aa0a
Initial commit of fix for https://github.com/tomchristie/django-rest-framework/issues/775
2013-05-18 13:10:05 +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
Markus Törnqvist
764299843c
ManyHyperlinkedRelatedField comes form rest_framework.relations now
2013-05-18 13:30:39 +03:00
Tom Christie
a73c16b85f
serializers.Field respects ordering on dicts if it exists. Closes #832
2013-05-18 11:27:48 +01: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
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
Tom Christie
d7c08222f1
Fix breadcrumb rendering issue
2013-05-07 14:11:48 +01:00
Tom Christie
ed2cf180c9
Version 2.3.0
2013-05-07 13:29:38 +01:00
Tom Christie
3353889ae8
Docs for FileUploadParser
2013-05-07 13:27:27 +01:00
Tom Christie
642970a1b8
Merge pull request #806 from wronglink/master
...
Added FileUploadParser
2013-05-07 05:09:09 -07:00
Tom Christie
3c2bb06660
Support for multiple filter classes
2013-05-07 13:00:44 +01:00
Tom Christie
d71a5533f9
allow_empty -> pending deprecation in preference of overridden get_queryset.
2013-05-07 12:25:41 +01:00
Tom Christie
b70c9cc107
Merge master
2013-05-05 18:12:35 +01:00
Tom Christie
75b2afcb23
Merge branch 'master' into 2.3
2013-05-05 16:48:46 +01:00
Tom Christie
660d240517
.action attribute on viewsets
2013-05-05 16:48:00 +01:00
Tom Christie
538d2e35e7
lookup_field on hyperlink serializers
2013-05-05 16:47:45 +01:00
Michael Elovskikh
a514232815
Raise ParseError if can't handle the uploaded file
2013-05-04 17:18:41 +06: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
Michael Elovskikh
0c85768435
Added FileUploadParser refs #7
2013-05-03 01:37:25 +06:00
Tom Christie
387250bee4
Automagically determine base_name in router class
2013-05-02 12:07:37 +01:00
Tom Christie
e4067bfb75
introduce lookup_field and add pendingdeprecationwarnings
2013-05-02 12:07:18 +01:00
Victor Shih
8cabae22c5
Example and spelling fixes. Change "browseable" to "browsable" for consistency.
2013-05-01 21:26:40 -07:00
Tom Christie
35f99cddc4
lookup_field on hyperlinked fields, and overriddable hyperlinked fields. Closes #688
2013-05-01 09:03:09 +01:00
Danilo Bargen
e5040fbf94
Catch ImproperlyConfigured exception in compat.py ( fixes #803 )
2013-04-30 23:24:33 +02:00
Tom Christie
22af28d146
Merge master
2013-04-30 19:32:34 +01:00