From a14f1e886402b8d0f742fdbb912b03a4004e1735 Mon Sep 17 00:00:00 2001
From: Tom Christie
Date: Wed, 2 Oct 2013 13:45:35 +0100
Subject: Serializers can now be rendered directly to HTML

---
 rest_framework/serializers.py | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

(limited to 'rest_framework/serializers.py')

diff --git a/rest_framework/serializers.py b/rest_framework/serializers.py
index 8d2e0feb..206a8123 100644
--- a/rest_framework/serializers.py
+++ b/rest_framework/serializers.py
@@ -32,6 +32,13 @@ from rest_framework.relations import *
 from rest_framework.fields import *
 
 
+def pretty_name(name):
+    """Converts 'first_name' to 'First name'"""
+    if not name:
+        return ''
+    return name.replace('_', ' ').capitalize()
+
+
 class RelationsList(list):
     _deleted = []
 
@@ -306,7 +313,17 @@ class BaseSerializer(WritableField):
         for field_name, field in self.fields.items():
             field.initialize(parent=self, field_name=field_name)
             key = self.get_field_key(field_name)
-            value = field.field_to_native(obj, field_name)
+            if self._errors:
+                value = self.init_data.get(field_name)
+            else:
+                value = field.field_to_native(obj, field_name)
+
+            field._errors = self._errors.get(key) if self._errors else None
+            field._name = field_name
+            field._value = value
+            if not field.label:
+                field.label = pretty_name(key)
+
             ret[key] = value
             ret.fields[key] = field
         return ret
-- 
cgit v1.2.3


From 8d4ba478cc5725b4de6ab86b4825b1ea94cb4c7b Mon Sep 17 00:00:00 2001
From: Tom Christie
Date: Wed, 2 Oct 2013 16:13:34 +0100
Subject: Fix rendering of forms and add error rendering on HTML form

---
 rest_framework/serializers.py | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

(limited to 'rest_framework/serializers.py')

diff --git a/rest_framework/serializers.py b/rest_framework/serializers.py
index 206a8123..bc9f73d1 100644
--- a/rest_framework/serializers.py
+++ b/rest_framework/serializers.py
@@ -308,24 +308,14 @@ class BaseSerializer(WritableField):
         """
         ret = self._dict_class()
         ret.fields = self._dict_class()
-        ret.empty = obj is None
 
         for field_name, field in self.fields.items():
             field.initialize(parent=self, field_name=field_name)
             key = self.get_field_key(field_name)
-            if self._errors:
-                value = self.init_data.get(field_name)
-            else:
-                value = field.field_to_native(obj, field_name)
-
-            field._errors = self._errors.get(key) if self._errors else None
-            field._name = field_name
-            field._value = value
-            if not field.label:
-                field.label = pretty_name(key)
-
+            value = field.field_to_native(obj, field_name)
             ret[key] = value
-            ret.fields[key] = field
+            ret.fields[key] = self.augment_field(field, field_name, key, value)
+
         return ret
 
     def from_native(self, data, files):
@@ -333,6 +323,7 @@ class BaseSerializer(WritableField):
         Deserialize primitives -> objects.
         """
         self._errors = {}
+
         if data is not None or files is not None:
             attrs = self.restore_fields(data, files)
             if attrs is not None:
@@ -343,6 +334,15 @@ class BaseSerializer(WritableField):
         if not self._errors:
             return self.restore_object(attrs, instance=getattr(self, 'object', None))
 
+    def augment_field(self, field, field_name, key, value):
+        # This horrible stuff is to manage serializers rendering to HTML
+        field._errors = self._errors.get(key) if self._errors else None
+        field._name = field_name
+        field._value = self.init_data.get(key) if self._errors and self.init_data else value
+        if not field.label:
+            field.label = pretty_name(key)
+        return field
+
     def field_to_native(self, obj, field_name):
         """
         Override default so that the serializer can be used as a nested field
-- 
cgit v1.2.3


From 9e29c6389529210978d58cee78e437b901f9daa2 Mon Sep 17 00:00:00 2001
From: Tom Christie
Date: Thu, 10 Oct 2013 17:33:22 +0100
Subject: Ensure read-only fields don't break with current HTML renderer
 behavior

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

(limited to 'rest_framework/serializers.py')

diff --git a/rest_framework/serializers.py b/rest_framework/serializers.py
index bc9f73d1..8e945688 100644
--- a/rest_framework/serializers.py
+++ b/rest_framework/serializers.py
@@ -310,6 +310,8 @@ class BaseSerializer(WritableField):
         ret.fields = self._dict_class()
 
         for field_name, field in self.fields.items():
+            if field.read_only and obj is None:
+               continue
             field.initialize(parent=self, field_name=field_name)
             key = self.get_field_key(field_name)
             value = field.field_to_native(obj, field_name)
-- 
cgit v1.2.3