aboutsummaryrefslogtreecommitdiffstats
path: root/rest_framework/serializers.py
diff options
context:
space:
mode:
authorTom Christie2012-10-15 04:50:28 -0700
committerTom Christie2012-10-15 04:50:28 -0700
commite88ca9637bd4f49659dd80ca7afd0f38adf07746 (patch)
tree2cf1ca191bd1136664e12ac898eb8ebe67410b32 /rest_framework/serializers.py
parent41dd63b3b0abcb615768fe2774cbdf10b9ba1cf0 (diff)
parentc94272650915eef368cdc5d157644884c3eecccb (diff)
downloaddjango-rest-framework-e88ca9637bd4f49659dd80ca7afd0f38adf07746.tar.bz2
Merge pull request #295 from ulmus/restframework2
Added TextField to serializer
Diffstat (limited to 'rest_framework/serializers.py')
-rw-r--r--rest_framework/serializers.py4
1 files changed, 4 insertions, 0 deletions
diff --git a/rest_framework/serializers.py b/rest_framework/serializers.py
index 06330017..13f8cde2 100644
--- a/rest_framework/serializers.py
+++ b/rest_framework/serializers.py
@@ -377,10 +377,14 @@ class ModelSerializer(Serializer):
field_mapping = {
models.FloatField: FloatField,
models.IntegerField: IntegerField,
+ models.PositiveIntegerField: IntegerField,
+ models.SmallIntegerField: IntegerField,
+ models.PositiveSmallIntegerField: IntegerField,
models.DateTimeField: DateTimeField,
models.DateField: DateField,
models.EmailField: EmailField,
models.CharField: CharField,
+ models.TextField: CharField,
models.CommaSeparatedIntegerField: CharField,
models.BooleanField: BooleanField,
}