Skip to content

fix for PR #7 #10

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from Apr 28, 2015
Merged

fix for PR #7 #10

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0b0cdaa
fix for PR #7
weeliat Apr 27, 2015
f95543f
bug fix to string check, should contain and not equal to
weeliat Apr 28, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions rest_framework_proxy/views.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import base64
import json
import requests

from django.utils import six
Expand Down Expand Up @@ -53,10 +54,11 @@ def get_request_params(self, request):
return {}

def get_request_data(self, request):
data = {}
if request.DATA:
data.update(request.DATA)
return data
if 'application/json' in request.content_type:
return json.dumps(request.DATA) if request.DATA \
else json.dumps(request.data)

return request.DATA if request.DATA else request.data

def get_request_files(self, request):
files = {}
Expand Down