phzhik/gault-millau
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'feature/gm-192' into feature/gm-148

Browse Source
This commit is contained in:
evgeniy-st 2019-10-15 17:48:40 +03:00
commit f7eb534570
2 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
apps/search_indexes/documents/establishment.py
View File

@ -39,13 +39,13 @@ class EstablishmentDocument(Document):
}), }),
}, },
multi=True) multi=True)
tags = fields.ObjectField( # tags = fields.ObjectField(
properties={ # properties={
'tag': fields.ObjectField(properties={ # 'tag': fields.ObjectField(properties={
'id': fields.IntegerField(), # 'id': fields.IntegerField(),
}), # }),
}, # },
multi=True) # multi=True)
address = fields.ObjectField( address = fields.ObjectField(
properties={ properties={
'id': fields.IntegerField(), 'id': fields.IntegerField(),

7
apps/tag/models.py
View File

@ -39,9 +39,10 @@ class TagCategoryQuerySet(models.QuerySet):
return self.filter(news_types__isnull=True) return self.filter(news_types__isnull=True)
def for_establishments(self): def for_establishments(self):
return self.filter(models.Q(est_subtype_tag_categories__isnull=True) | return self
models.Q(est_type_tag_categories__isnull=True)).\ # return self.filter(models.Q(est_subtype_tag_categories__isnull=True) |
distinct() # models.Q(est_type_tag_categories__isnull=True)).\
# distinct()
def with_related(self): def with_related(self):
return self.select_related('country').prefetch_related('tags') return self.select_related('country').prefetch_related('tags')