Commit 8e9cb1e6 by Tom Christie Committed by GitHub

Merge pull request #5014 from dczech/feature/decouple-bigautofield

Include URL path regexs in API schemas where valid.
parents 7d64cf56 54d0901f
...@@ -526,6 +526,7 @@ class SchemaGenerator(object): ...@@ -526,6 +526,7 @@ class SchemaGenerator(object):
title = '' title = ''
description = '' description = ''
schema_cls = coreschema.String schema_cls = coreschema.String
kwargs = {}
if model is not None: if model is not None:
# Attempt to infer a field description if possible. # Attempt to infer a field description if possible.
try: try:
...@@ -541,14 +542,16 @@ class SchemaGenerator(object): ...@@ -541,14 +542,16 @@ class SchemaGenerator(object):
elif model_field is not None and model_field.primary_key: elif model_field is not None and model_field.primary_key:
description = get_pk_description(model, model_field) description = get_pk_description(model, model_field)
if isinstance(model_field, models.AutoField): if hasattr(view, 'lookup_value_regex') and view.lookup_field == variable:
kwargs['pattern'] = view.lookup_value_regex
elif isinstance(model_field, models.AutoField):
schema_cls = coreschema.Integer schema_cls = coreschema.Integer
field = coreapi.Field( field = coreapi.Field(
name=variable, name=variable,
location='path', location='path',
required=True, required=True,
schema=schema_cls(title=title, description=description) schema=schema_cls(title=title, description=description, **kwargs)
) )
fields.append(field) fields.append(field)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment