From cc55a7b64310cdd4b8b96e8270a48fd994ede90c Mon Sep 17 00:00:00 2001
From: Ludwig Kraatz
Date: Tue, 13 Nov 2012 18:00:41 +0100
Subject: Returning a Location Header on Create

when creating a Resource with HyperlinkedIdentityField of any name
---
 rest_framework/mixins.py | 19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)

(limited to 'rest_framework/mixins.py')

diff --git a/rest_framework/mixins.py b/rest_framework/mixins.py
index c3625a88..f54b5b1f 100644
--- a/rest_framework/mixins.py
+++ b/rest_framework/mixins.py
@@ -7,6 +7,7 @@ which allows mixin classes to be composed in interesting ways.
 from django.http import Http404
 from rest_framework import status
 from rest_framework.response import Response
+from rest_framework.fields import HyperlinkedIdentityField
 
 
 class CreateModelMixin(object):
@@ -19,9 +20,23 @@ class CreateModelMixin(object):
         if serializer.is_valid():
             self.pre_save(serializer.object)
             self.object = serializer.save()
-            return Response(serializer.data, status=status.HTTP_201_CREATED)
+            headers = self.get_success_headers(serializer)
+            return Response(serializer.data, status=status.HTTP_201_CREATED, headers=headers)
         return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST)
-
+    
+    def get_success_headers(self,serializer):
+        headers = []
+        identity_field = identity_name = None
+        for name,field in serializer.fields.iteritems():
+                if isinstance(field,HyperlinkedIdentityField):
+                    identity_name, identity_field = name, field
+        if identity_field:
+            #identity_field.initialize(serializer,"url")
+            headers.append(
+                ("Location",identity_field.field_to_native(self.object,identity_name))
+            )
+        return headers
+    
     def pre_save(self, obj):
         pass
 
-- 
cgit v1.2.3


From 573de11b233a85347456a4d7e50fd7345d13db03 Mon Sep 17 00:00:00 2001
From: Ludwig Kraatz
Date: Tue, 13 Nov 2012 18:07:38 +0100
Subject: changed buggy response + code ploishing

reponse didnt handle any headers at all. Accepts now a dict of headers
and sets those properly
---
 rest_framework/mixins.py | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

(limited to 'rest_framework/mixins.py')

diff --git a/rest_framework/mixins.py b/rest_framework/mixins.py
index f54b5b1f..eddd8f49 100644
--- a/rest_framework/mixins.py
+++ b/rest_framework/mixins.py
@@ -25,16 +25,11 @@ class CreateModelMixin(object):
         return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST)
     
     def get_success_headers(self,serializer):
-        headers = []
-        identity_field = identity_name = None
+        headers = {}
         for name,field in serializer.fields.iteritems():
                 if isinstance(field,HyperlinkedIdentityField):
-                    identity_name, identity_field = name, field
-        if identity_field:
-            #identity_field.initialize(serializer,"url")
-            headers.append(
-                ("Location",identity_field.field_to_native(self.object,identity_name))
-            )
+                    headers["Location"] = field.field_to_native(self.object,name)
+                    break
         return headers
     
     def pre_save(self, obj):
-- 
cgit v1.2.3


From b341dc70af828d066eb3891e8eafb6337cdd2d04 Mon Sep 17 00:00:00 2001
From: Ludwig Kraatz
Date: Tue, 13 Nov 2012 19:15:42 +0100
Subject: fixed ugly code

Location header is set just, if there is a Location field on the
serializer.
---
 rest_framework/mixins.py | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

(limited to 'rest_framework/mixins.py')

diff --git a/rest_framework/mixins.py b/rest_framework/mixins.py
index eddd8f49..832365e5 100644
--- a/rest_framework/mixins.py
+++ b/rest_framework/mixins.py
@@ -20,17 +20,15 @@ class CreateModelMixin(object):
         if serializer.is_valid():
             self.pre_save(serializer.object)
             self.object = serializer.save()
-            headers = self.get_success_headers(serializer)
+            headers = self.get_success_headers(serializer.data)
             return Response(serializer.data, status=status.HTTP_201_CREATED, headers=headers)
         return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST)
     
-    def get_success_headers(self,serializer):
-        headers = {}
-        for name,field in serializer.fields.iteritems():
-                if isinstance(field,HyperlinkedIdentityField):
-                    headers["Location"] = field.field_to_native(self.object,name)
-                    break
-        return headers
+    def get_success_headers(self,data):
+        if "url" in data:
+            return {'Location':data.get("url")}
+        else:
+            return {}
     
     def pre_save(self, obj):
         pass
-- 
cgit v1.2.3


From 3a30a9b1cbb4444adf3cbb1d3d80c637b5f4f2ca Mon Sep 17 00:00:00 2001
From: Ludwig Kraatz
Date: Tue, 13 Nov 2012 20:30:18 +0100
Subject: removed useless line after polishing code

added it in first commit but after third it became useless.
---
 rest_framework/mixins.py | 1 -
 1 file changed, 1 deletion(-)

(limited to 'rest_framework/mixins.py')

diff --git a/rest_framework/mixins.py b/rest_framework/mixins.py
index 832365e5..f6119aa1 100644
--- a/rest_framework/mixins.py
+++ b/rest_framework/mixins.py
@@ -7,7 +7,6 @@ which allows mixin classes to be composed in interesting ways.
 from django.http import Http404
 from rest_framework import status
 from rest_framework.response import Response
-from rest_framework.fields import HyperlinkedIdentityField
 
 
 class CreateModelMixin(object):
-- 
cgit v1.2.3


From 8b999c6bb500a045c6c32412009cbd3b1cd5a56b Mon Sep 17 00:00:00 2001
From: Ludwig Kraatz
Date: Wed, 14 Nov 2012 11:46:16 +0100
Subject: polishing code

and adding myself to auhtors file
---
 rest_framework/mixins.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'rest_framework/mixins.py')

diff --git a/rest_framework/mixins.py b/rest_framework/mixins.py
index f6119aa1..089425d5 100644
--- a/rest_framework/mixins.py
+++ b/rest_framework/mixins.py
@@ -24,8 +24,8 @@ class CreateModelMixin(object):
         return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST)
     
     def get_success_headers(self,data):
-        if "url" in data:
-            return {'Location':data.get("url")}
+        if 'url' in data:
+            return {'Location': data.get('url')}
         else:
             return {}
     
-- 
cgit v1.2.3


From d9c62c20a7a025d8e94fb881641731b340088f98 Mon Sep 17 00:00:00 2001
From: Ludwig Kraatz
Date: Wed, 14 Nov 2012 13:24:20 +0100
Subject: once more polished

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

(limited to 'rest_framework/mixins.py')

diff --git a/rest_framework/mixins.py b/rest_framework/mixins.py
index 089425d5..cd104a7c 100644
--- a/rest_framework/mixins.py
+++ b/rest_framework/mixins.py
@@ -23,7 +23,7 @@ class CreateModelMixin(object):
             return Response(serializer.data, status=status.HTTP_201_CREATED, headers=headers)
         return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST)
     
-    def get_success_headers(self,data):
+    def get_success_headers(self, data):
         if 'url' in data:
             return {'Location': data.get('url')}
         else:
-- 
cgit v1.2.3