Merge branch 'master' of https://github.com/agonzalezro/mongoengine
This commit is contained in:
		| @@ -706,7 +706,7 @@ class TopLevelDocumentMetaclass(DocumentMetaclass): | |||||||
|             meta['queryset_class'] = manager.queryset_class |             meta['queryset_class'] = manager.queryset_class | ||||||
|         new_class.objects = manager |         new_class.objects = manager | ||||||
|  |  | ||||||
|         indicies = meta['indexes'] + abstract_base_indexes |         indicies = [meta['indexes']] + abstract_base_indexes | ||||||
|         user_indexes = [QuerySet._build_index_spec(new_class, spec) |         user_indexes = [QuerySet._build_index_spec(new_class, spec) | ||||||
|                         for spec in indicies] + base_indexes |                         for spec in indicies] + base_indexes | ||||||
|         new_class._meta['indexes'] = user_indexes |         new_class._meta['indexes'] = user_indexes | ||||||
|   | |||||||
| @@ -492,6 +492,7 @@ class QuerySet(object): | |||||||
|             spec = {'fields': spec} |             spec = {'fields': spec} | ||||||
|  |  | ||||||
|         index_list = [] |         index_list = [] | ||||||
|  |         direction = None | ||||||
|         use_types = doc_cls._meta.get('allow_inheritance', True) |         use_types = doc_cls._meta.get('allow_inheritance', True) | ||||||
|         for key in spec['fields']: |         for key in spec['fields']: | ||||||
|             # Get ASCENDING direction from +, DESCENDING from -, and GEO2D from * |             # Get ASCENDING direction from +, DESCENDING from -, and GEO2D from * | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user