Skip to content

Commit

Permalink
Merge pull request #2933 from cancan101/overide_method_action
Browse files Browse the repository at this point in the history
Set the action on a view when override_method regardless of its None-ness
  • Loading branch information
tomchristie committed May 27, 2015
2 parents ad3bb05 + a804d0b commit 95a27a1
Showing 1 changed file with 4 additions and 6 deletions.
10 changes: 4 additions & 6 deletions rest_framework/request.py
Original file line number Diff line number Diff line change
Expand Up @@ -48,16 +48,14 @@ def __init__(self, view, request, method):

def __enter__(self):
self.view.request = clone_request(self.request, self.method)
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())
# 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.request = self.request
if self.action is not None:
self.view.action = self.action
self.view.action = self.action


class Empty(object):
Expand Down

0 comments on commit 95a27a1

Please sign in to comment.