Skip to content

Commit 522e7bd

Browse files
committed
Prevent django from throwing errors is url is None
1 parent 403a4b2 commit 522e7bd

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
@@ -177,9 +177,9 @@ def extract_id_from_url(url):
177177
def extract_id(fields, resource):
178178
for field_name, field in six.iteritems(fields):
179179
if field_name == 'id':
180-
return encoding.force_text(resource.get(field_name))
180+
return encoding.force_text(resource.get(field_name)) if resource.get(field_name) else None
181181
if field_name == api_settings.URL_FIELD_NAME:
182-
return extract_id_from_url(resource.get(field_name))
182+
return extract_id_from_url(resource.get(field_name)) if resource.get(field_name) else None
183183

184184

185185
def extract_attributes(fields, resource):

0 commit comments

Comments
 (0)