Ensure fields in docs forms are ordered

This commit is contained in:
Tom Christie 2017-02-28 10:39:21 +00:00
parent 1ed82aa104
commit c412de920e
2 changed files with 7 additions and 6 deletions

View File

@ -39,11 +39,11 @@ def field_to_schema(field):
) )
elif isinstance(field, serializers.Serializer): elif isinstance(field, serializers.Serializer):
return coreschema.Object( return coreschema.Object(
properties={ properties=OrderedDict([
key: field_to_schema(value) (key, field_to_schema(value))
for key, value for key, value
in field.fields.items() in field.fields.items()
}, ]),
title=title, title=title,
description=description description=description
) )

View File

@ -2,6 +2,7 @@ from __future__ import absolute_import, unicode_literals
import re import re
from collections import OrderedDict
from django import template from django import template
from django.template import loader from django.template import loader
from django.utils import six from django.utils import six
@ -76,10 +77,10 @@ def with_location(fields, location):
@register.simple_tag @register.simple_tag
def form_for_link(link): def form_for_link(link):
import coreschema import coreschema
properties = { properties = OrderedDict([
field.name: field.schema or coreschema.String() (field.name, field.schema or coreschema.String())
for field in link.fields for field in link.fields
} ])
required = [ required = [
field.name field.name
for field in link.fields for field in link.fields