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

fix

Browse Source
This commit is contained in:
Kuroshini 2020-02-10 12:27:05 +03:00
parent 2c9e0033ec
commit 92367b35d7
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/establishment/models.py
View File

@ -534,7 +534,7 @@ class EstablishmentQuerySet(models.QuerySet):
"""Return QuerySet with establishments that user has an access.""" """Return QuerySet with establishments that user has an access."""
from account.models import UserRole from account.models import UserRole
if not user.is_superuser: if not user.is_superuser and not user.is_anonymous:
filters = {'address__city__country__code': country_code} filters = {'address__city__country__code': country_code}
if user.is_establishment_administrator and not user.is_establishment_manager: if user.is_establishment_administrator and not user.is_establishment_manager:
filters.update({ filters.update({

4
apps/review/models.py
View File

@ -105,10 +105,10 @@ class Review(BaseAttributes, TranslatedFieldsMixin):
@property @property
def visited_on(self): def visited_on(self):
from account.models import User from account.models import User
from account.serializers import UserBaseSerializer
if isinstance(self.reviewer, User): if isinstance(self.reviewer, User):
return { return {
'user': self.reviewer, 'user': UserBaseSerializer(self.reviewer).data,
'date': self.visited_at, 'date': self.visited_at,
} }
return None return None

1
apps/review/serializers/common.py
View File

@ -6,6 +6,7 @@ from review.models import Review, Inquiries, GridItems
class ReviewBaseSerializer(serializers.ModelSerializer): class ReviewBaseSerializer(serializers.ModelSerializer):
text_translated = serializers.CharField(read_only=True) text_translated = serializers.CharField(read_only=True)
status_display = serializers.CharField(read_only=True) status_display = serializers.CharField(read_only=True)
visited_on = serializers.DictField(read_only=True, allow_null=True)
class Meta: class Meta:
model = Review model = Review