From 522e7bd77a78f533865cb3c50cb3f5a4510a6e23 Mon Sep 17 00:00:00 2001 From: Jonathan Senecal Date: Wed, 9 Sep 2015 20:38:18 -0400 Subject: [PATCH] Prevent django from throwing errors is url is None --- rest_framework_json_api/utils.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rest_framework_json_api/utils.py b/rest_framework_json_api/utils.py index c639cbc2..630b6aa0 100644 --- a/rest_framework_json_api/utils.py +++ b/rest_framework_json_api/utils.py @@ -177,9 +177,9 @@ def extract_id_from_url(url): def extract_id(fields, resource): for field_name, field in six.iteritems(fields): if field_name == 'id': - return encoding.force_text(resource.get(field_name)) + return encoding.force_text(resource.get(field_name)) if resource.get(field_name) else None if field_name == api_settings.URL_FIELD_NAME: - return extract_id_from_url(resource.get(field_name)) + return extract_id_from_url(resource.get(field_name)) if resource.get(field_name) else None def extract_attributes(fields, resource):