Merge remote branch 'origin/dev' into dev

This commit is contained in:
Ross Lawley 2011-08-16 10:33:38 +01:00
commit f6961ae9c1

View File

@ -812,7 +812,8 @@ class BaseDocument(object):
field_cls = field.document_type
if field_cls in inspected_classes:
continue
geo_indices += field_cls._geo_indices(inspected_classes)
if hasattr(field_cls, '_geo_indices'):
geo_indices += field_cls._geo_indices(inspected_classes)
elif field._geo_index:
geo_indices.append(field)
return geo_indices