From 5f63d31b002020148c526f2d5ec27f723a06f2e9 Mon Sep 17 00:00:00 2001
From: Andrew Fong
Date: Sat, 16 Aug 2014 15:05:46 -0700
Subject: override_method should substitute action

A view's action is dependent on the request method. When overriding the method (e.g. to generate a form for a POST request on a GET call to the browseable API), the action should be updated as well. Otherwise, viewset functions may be in a weird limbo state where a 'list' action has a POST method.---
 rest_framework/request.py | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'rest_framework/request.py')

diff --git a/rest_framework/request.py b/rest_framework/request.py
index 40467c03..1ea61586 100644
--- a/rest_framework/request.py
+++ b/rest_framework/request.py
@@ -42,12 +42,16 @@ class override_method(object):
         self.view = view
         self.request = request
         self.method = method
+        self.action = getattr(view, 'action', None)
 
     def __enter__(self):
         self.view.request = clone_request(self.request, self.method)
+        action_map = getattr(self, 'action_map', {})
+        self.view.action = action_map.get(self.method.lower())
         return self.view.request
 
     def __exit__(self, *args, **kwarg):
+        self.view.action = self.action
         self.view.request = self.request
 
 
-- 
cgit v1.2.3


From 21cbf3484e04bb015c1921307cdf0306a81e571d Mon Sep 17 00:00:00 2001
From: Andrew Fong
Date: Sat, 16 Aug 2014 23:22:18 +0000
Subject: Fixed action_map being pulled from wrong object

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

(limited to 'rest_framework/request.py')

diff --git a/rest_framework/request.py b/rest_framework/request.py
index 1ea61586..735a9288 100644
--- a/rest_framework/request.py
+++ b/rest_framework/request.py
@@ -46,7 +46,7 @@ class override_method(object):
 
     def __enter__(self):
         self.view.request = clone_request(self.request, self.method)
-        action_map = getattr(self, 'action_map', {})
+        action_map = getattr(self.view, 'action_map', {})
         self.view.action = action_map.get(self.method.lower())
         return self.view.request
 
-- 
cgit v1.2.3


From 33af92e019fda70af7a4138972ee9780a9cc967a Mon Sep 17 00:00:00 2001
From: Tom Christie
Date: Mon, 18 Aug 2014 15:14:30 +0100
Subject: Always uppercase X-Http-Method-Override methods. Closes #1718.

---
 rest_framework/request.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'rest_framework/request.py')

diff --git a/rest_framework/request.py b/rest_framework/request.py
index 40467c03..dc696e36 100644
--- a/rest_framework/request.py
+++ b/rest_framework/request.py
@@ -280,8 +280,8 @@ class Request(object):
             self._method = self._request.method
 
             # Allow X-HTTP-METHOD-OVERRIDE header
-            self._method = self.META.get('HTTP_X_HTTP_METHOD_OVERRIDE',
-                                         self._method)
+            if 'HTTP_X_HTTP_METHOD_OVERRIDE' in self.META:
+                self._method = self.META['HTTP_X_HTTP_METHOD_OVERRIDE'].upper()
 
     def _load_stream(self):
         """
-- 
cgit v1.2.3


From 97d8f037cc1292407eae965ceb4df34a52bd6161 Mon Sep 17 00:00:00 2001
From: Tom Christie
Date: Mon, 18 Aug 2014 20:56:17 +0100
Subject: Only set .action attribute in override_method if it already existed
 on the view

---
 rest_framework/request.py | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

(limited to 'rest_framework/request.py')

diff --git a/rest_framework/request.py b/rest_framework/request.py
index 4f9345f3..d508f9b4 100644
--- a/rest_framework/request.py
+++ b/rest_framework/request.py
@@ -46,13 +46,16 @@ class override_method(object):
 
     def __enter__(self):
         self.view.request = clone_request(self.request, self.method)
-        action_map = getattr(self.view, 'action_map', {})
-        self.view.action = action_map.get(self.method.lower())
+        if self.action is not None:
+            # For viewsets we also set the `.action` attribute.
+            action_map = getattr(self.view, 'action_map', {})
+            self.view.action = action_map.get(self.method.lower())
         return self.view.request
 
     def __exit__(self, *args, **kwarg):
-        self.view.action = self.action
         self.view.request = self.request
+        if self.action is not None:
+            self.view.action = self.action
 
 
 class Empty(object):
-- 
cgit v1.2.3