Skip to content

Commit cc207d7

Browse files
committed
Merge pull request #83 from django-json-api/revert-75-feature/JsonAPISpec
Revert "Prevent django from throwing errors if url is None"
2 parents 3498201 + 0eff8c8 commit cc207d7

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

rest_framework_json_api/utils.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -202,9 +202,9 @@ def extract_id_from_url(url):
202202
def extract_id(fields, resource):
203203
for field_name, field in six.iteritems(fields):
204204
if field_name == 'id':
205-
return encoding.force_text(resource.get(field_name)) if resource.get(field_name) else None
205+
return encoding.force_text(resource.get(field_name))
206206
if field_name == api_settings.URL_FIELD_NAME:
207-
return extract_id_from_url(resource.get(field_name)) if resource.get(field_name) else None
207+
return extract_id_from_url(resource.get(field_name))
208208

209209

210210
def extract_attributes(fields, resource):

0 commit comments

Comments
 (0)