aboutsummaryrefslogtreecommitdiffstats
path: root/rest_framework/relations.py
AgeCommit message (Collapse)Author
2014-08-19Resolve linting issuesTom Christie
2014-04-13Merge remote-tracking branch 'origin/master' into 2.4.0Xavier Ordoquy
Conflicts: .travis.yml docs/api-guide/fields.md docs/api-guide/routers.md docs/topics/release-notes.md rest_framework/authentication.py rest_framework/serializers.py rest_framework/templatetags/rest_framework.py rest_framework/tests/test_authentication.py rest_framework/tests/test_filters.py rest_framework/tests/test_hyperlinkedserializers.py rest_framework/tests/test_serializer.py rest_framework/tests/test_testing.py rest_framework/utils/encoders.py tox.ini
2014-04-09Adds test that blank option is added when required=False on RelatedFieldsCarlton Gibson
2014-03-04Merge pull request #1442 from Anton-Shutik/masterTom Christie
RelatedField default value handling fixed
2014-02-28RelatedField.get_default_value: return empty list if self.many==TrueAnton Shutik
2014-02-27Allow 'None' to pass as a null value in RelatedFieldsDustin Farris
2014-02-27RelatedField default value handling fixedAnton Shutik
2014-01-09Removed useless try/exceptXavier Ordoquy
2013-09-25Merge masterTom Christie
2013-08-31Handle case where obj=None in PKRelatedField.field_to_native()Yuri Prezument
Fixes #1072
2013-08-30Merge masterTom Christie
2013-08-23Cleanup and dealing with empty form data.Tom Christie
2013-08-23Tweaks to display nested data in empty serializersTom Christie
2013-06-27pending deprecations -> deprecatedTom Christie
2013-06-27Remove deprecated codeTom Christie
2013-06-04Test cases and fix for plain-list relationships (ie not queryset) Closes #878.Tom Christie
2013-06-02view_name argument to HyperlinkedModelSerializer is now properly enforced. ↵Tom Christie
Closes #471
2013-05-31HyperlinkedModelSerializer lookup_field option should apply to ↵Tom Christie
HyperlinkedIdentityField
2013-05-29Added get_url hook to HyperlinkedIdentityField in line with ↵Tom Christie
HyperlinedRelatedField. Closes #883
2013-05-28Backwards compatible approach to HyperlinkedIdentityField URLs. Closes #892Tom Christie
2013-05-18Merge pull request #860 from andymckay/masterTom Christie
startswith can take a tuple
2013-05-18startswith can take a tupleAndy McKay
2013-05-18Display an empty label into related fields if it isn't requiredPablo Recio
2013-05-18Merge remote-tracking branch 'upstream/master'Craig de Stigter
2013-05-16HyperlinkedIdentityField uses `lookup_field` kwarg.Andy Freeland
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-05lookup_field on hyperlink serializersTom Christie
2013-05-02introduce lookup_field and add pendingdeprecationwarningsTom Christie
2013-05-01lookup_field on hyperlinked fields, and overriddable hyperlinked fields. ↵Tom Christie
Closes #688
2013-04-292.2's PendingDeprecationWarnings now become DeprecationWarnings. 2.3's ↵Tom Christie
PendingDeprecationWarnings added.
2013-04-25Cleanup docstringsTom Christie
2013-03-10Fixed #720Bouke Haarsma
2013-03-01fix function names and dotted lookups for use in ↵Craig de Stigter
PrimaryKeyRelatedField.field_to_native (they work in RelatedField.field_to_native already)
2013-02-12Relational fields use same field_to_native logic as regular fields.Tom Christie
Fixes #637. Closes #638.
2013-02-12Raise warnings if 'request' not in context for hyperlinked fields.Tom Christie
2013-02-06Try the correct NoReverseMatch location.Marc Tamlyn
2013-02-06Purge naked excepts.Marc Tamlyn
Most of these had obvious exceptions which would be thrown. Some I'm not sure about but they should at least catch only Exception so as not to ignore SystemExit and other inappropriate Error classes.
2013-02-04Cleanup importsTom Christie
Mostly adding `from __future__ import unicode_literals` everywhere.
2013-02-04remove broken importTom Christie
2013-02-04Merge branch 'py3k' into 2.2Tom Christie
Conflicts: rest_framework/relations.py rest_framework/serializers.py rest_framework/tests/relations_hyperlink.py rest_framework/tests/relations_slug.py
2013-02-013.2, 3.3 compatTom Christie
2013-02-01Merge branch 'p3k' of https://github.com/linovia/django-rest-framework into ↵Tom Christie
working Conflicts: rest_framework/authentication.py rest_framework/relations.py rest_framework/serializers.py rest_framework/settings.py rest_framework/tests/authentication.py rest_framework/tests/genericrelations.py rest_framework/tests/generics.py rest_framework/tests/relations_hyperlink.py rest_framework/tests/relations_nested.py rest_framework/tests/relations_pk.py rest_framework/tests/serializer.py
2013-01-30Add dprecation warningsTom Christie
2013-01-30Tweak empty list implementationTom Christie
2013-01-30Merge branch 'master' into many-fieldsTom Christie
Conflicts: rest_framework/relations.py
2013-01-30Use many=True style for pk relations.Tom Christie
2013-01-29Fix processing of ManyToManyField when it is emptyFernando Rocha
Signed-off-by: Fernando Rocha <fernandogrd@gmail.com>
2013-01-18Starting migration from ManyField to Field(many=True)Tom Christie
2013-01-18Raise Validation Errors when relationships receive incorrect types. Fixes #590.Tom Christie
2013-01-16Drop bits of relations_slug tests which don't mirror existing tests.Tom Christie
2013-01-08Merge remote-tracking branch 'upstream/master' into null-one-to-oneMark Aaron Shirley