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

Merge branch 'develop' of ssh://gl.id-east.ru:222/gm/gm-backend into develop

Browse Source
This commit is contained in:
Dmitriy Kuzmenko 2019-11-03 20:33:58 +03:00
commit 9d3e278763
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
apps/establishment/management/commands/add_establishment_description.py
View File

@ -24,17 +24,17 @@ class Command(BaseCommand):
for r_id, establishment_id, new_date in queryset:
try:
es_id, date = valid_reviews[r_id]
review_id, date = valid_reviews[establishment_id]
except KeyError:
valid_reviews[r_id] = (establishment_id, new_date)
valid_reviews[establishment_id] = (r_id, new_date)
else:
if new_date > date:
valid_reviews[r_id] = (establishment_id, new_date)
valid_reviews[establishment_id] = (r_id, new_date)
text_qs = ReviewTexts.objects.exclude(
locale__isnull=True
).filter(
review_id__in=(r_id for r_id in valid_reviews.keys()),
review_id__in=(value[0] for value in valid_reviews.values()),
).values_list(
'review__establishment_id',
'locale',
@ -42,7 +42,7 @@ class Command(BaseCommand):
)
for es_id, locale, text in text_qs:
establishment = Establishment.objects.filter(old_id=es_id, description__isnull=True).first()
establishment = Establishment.objects.filter(old_id=es_id).first()
if establishment:
description = establishment.description
description.update({

2
apps/utils/models.py
View File

@ -79,7 +79,7 @@ def translate_field(self, field_name):
if value is None:
value = field.get(get_default_locale())
if value is None:
value = field.get(next(iter(field.keys())))
value = field.get(next(iter(field.keys()), None))
return value
return None
return translate