From d099b108edf2e3e7c10c57053ec639be7e58f47c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mustafa=20Dokumac=C4=B1?= Date: Tue, 23 Oct 2018 11:17:21 +0200 Subject: [PATCH 1/3] Format field names for metadata (OPTIONS request) Field names are represented wrong in OPTIONS call if you use `JSON_API_FORMAT_FIELD_NAMES` in settings. This patch fixes metadata. --- rest_framework_json_api/metadata.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/rest_framework_json_api/metadata.py b/rest_framework_json_api/metadata.py index 8306a9dd..5bfcd965 100644 --- a/rest_framework_json_api/metadata.py +++ b/rest_framework_json_api/metadata.py @@ -7,7 +7,8 @@ from rest_framework.settings import api_settings from rest_framework.utils.field_mapping import ClassLookupDict -from rest_framework_json_api.utils import get_related_resource_type +from rest_framework_json_api.settings import json_api_settings +from rest_framework_json_api.utils import get_related_resource_type, format_value class JSONAPIMetadata(SimpleMetadata): @@ -83,7 +84,7 @@ def get_serializer_info(self, serializer): serializer.fields.pop(api_settings.URL_FIELD_NAME, None) return OrderedDict([ - (field_name, self.get_field_info(field)) + (format_value(field_name, json_api_settings.FORMAT_FIELD_NAMES), self.get_field_info(field)) for field_name, field in serializer.fields.items() ]) From 4d1e217ad7349e3df39981b93186aae3723ae616 Mon Sep 17 00:00:00 2001 From: Oliver Sauder Date: Wed, 24 Oct 2018 09:40:20 +0200 Subject: [PATCH 2/3] apply suggestion Co-Authored-By: mstdokumaci --- rest_framework_json_api/metadata.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rest_framework_json_api/metadata.py b/rest_framework_json_api/metadata.py index 5bfcd965..9f30e692 100644 --- a/rest_framework_json_api/metadata.py +++ b/rest_framework_json_api/metadata.py @@ -84,7 +84,7 @@ def get_serializer_info(self, serializer): serializer.fields.pop(api_settings.URL_FIELD_NAME, None) return OrderedDict([ - (format_value(field_name, json_api_settings.FORMAT_FIELD_NAMES), self.get_field_info(field)) + (format_value(field_name), self.get_field_info(field)) for field_name, field in serializer.fields.items() ]) From a5f4135035627376a4dab4f1e711acefc508527c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mustafa=20Dokumac=C4=B1?= Date: Wed, 24 Oct 2018 09:41:13 +0200 Subject: [PATCH 3/3] remove unnecessary --- rest_framework_json_api/metadata.py | 1 - 1 file changed, 1 deletion(-) diff --git a/rest_framework_json_api/metadata.py b/rest_framework_json_api/metadata.py index 9f30e692..f5bc4010 100644 --- a/rest_framework_json_api/metadata.py +++ b/rest_framework_json_api/metadata.py @@ -7,7 +7,6 @@ from rest_framework.settings import api_settings from rest_framework.utils.field_mapping import ClassLookupDict -from rest_framework_json_api.settings import json_api_settings from rest_framework_json_api.utils import get_related_resource_type, format_value