From 241be38340dcea9a49ce741ba844171ce02db2bd Mon Sep 17 00:00:00 2001
From: Jens Alm
Date: Mon, 15 Oct 2012 09:14:01 +0200
Subject: Added TextField to recognized fields

---
 rest_framework/serializers.py | 1 +
 1 file changed, 1 insertion(+)

(limited to 'rest_framework/serializers.py')

diff --git a/rest_framework/serializers.py b/rest_framework/serializers.py
index 06330017..0f19956e 100644
--- a/rest_framework/serializers.py
+++ b/rest_framework/serializers.py
@@ -381,6 +381,7 @@ class ModelSerializer(Serializer):
             models.DateField: DateField,
             models.EmailField: EmailField,
             models.CharField: CharField,
+			models.TextField: TextField,
             models.CommaSeparatedIntegerField: CharField,
             models.BooleanField: BooleanField,
         }
-- 
cgit v1.2.3


From 36cc56bc9d49832ca990ba8568903966f46a2938 Mon Sep 17 00:00:00 2001
From: Jens Alm
Date: Mon, 15 Oct 2012 10:06:50 +0200
Subject: Added tests for TextField

---
 rest_framework/serializers.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'rest_framework/serializers.py')

diff --git a/rest_framework/serializers.py b/rest_framework/serializers.py
index 0f19956e..5afbced2 100644
--- a/rest_framework/serializers.py
+++ b/rest_framework/serializers.py
@@ -381,7 +381,7 @@ class ModelSerializer(Serializer):
             models.DateField: DateField,
             models.EmailField: EmailField,
             models.CharField: CharField,
-			models.TextField: TextField,
+            models.TextField: TextField,
             models.CommaSeparatedIntegerField: CharField,
             models.BooleanField: BooleanField,
         }
-- 
cgit v1.2.3


From c94272650915eef368cdc5d157644884c3eecccb Mon Sep 17 00:00:00 2001
From: Jens Alm
Date: Mon, 15 Oct 2012 13:46:44 +0200
Subject: Added docs, integer fields and refactored models.TextField to use
 CharField

I realized that per the django forms, there is no need for a separate
TextField, an unlimited CharField is perfectly good.
Also added default field for the different IntegerField types
---
 rest_framework/serializers.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'rest_framework/serializers.py')

diff --git a/rest_framework/serializers.py b/rest_framework/serializers.py
index 5afbced2..13f8cde2 100644
--- a/rest_framework/serializers.py
+++ b/rest_framework/serializers.py
@@ -377,11 +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: TextField,
+            models.TextField: CharField,
             models.CommaSeparatedIntegerField: CharField,
             models.BooleanField: BooleanField,
         }
-- 
cgit v1.2.3