From 950f1822bce77b9ba619c83cef080547d81b94f2 Mon Sep 17 00:00:00 2001 From: Henrik Levkowetz Date: Wed, 20 May 2020 19:38:44 +0000 Subject: [PATCH] Refined the makeresources management command slightly to improve handling of models with names ending in 'Resource' -- tastypie requires the resource name to be explicitly set in that case. - Legacy-Id: 17858 --- ietf/api/management/commands/makeresources.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ietf/api/management/commands/makeresources.py b/ietf/api/management/commands/makeresources.py index 087ed1b0f..07f8402e7 100644 --- a/ietf/api/management/commands/makeresources.py +++ b/ietf/api/management/commands/makeresources.py @@ -44,7 +44,7 @@ class {{model.name}}Resource(ModelResource):{% if model.foreign_keys %}{% for fk queryset = {{model.name}}.objects.all() serializer = api.Serializer() cache = SimpleCache() - #resource_name = '{{model.resource_name}}' + {% if model.rn_comment %}#resource_name = '{{model.resource_name}}'{% else %}resource_name = '{{model.resource_name}}'{% endif %} ordering = ['{{model.pk_name}}', ] filtering = { {% for name in model.plain_names %} "{{ name }}": ALL,{%endfor%}{% for name in model.fk_names%} @@ -178,6 +178,7 @@ class Command(AppCommand): fk_names=fk_names, m2m_names=m2m_names, pk_name=pk_name, + rn_comment=False if resource_name.endswith('resource') else True, ) # Sort resources according to internal FK reference depth