This commit is contained in:
Your Name 2022-01-17 14:41:50 -05:00
parent 94918f2a84
commit beaf229d4c
2 changed files with 11 additions and 2 deletions

View file

@ -202,7 +202,7 @@ class UserOwnedEntity(models.Model):
"""
user_owned_entities = cls.objects.filter(owner=owner)
if is_following:
user_owned_entities = user_owned_entities.exclude(visibility__ne=2)
user_owned_entities = user_owned_entities.exclude(visibility=2)
else:
user_owned_entities = user_owned_entities.filter(visibility=0)
return user_owned_entities
@ -269,7 +269,7 @@ class Tag(models.Model):
def find_by_user(cls, tag, owner, is_following):
user_owned_entities = cls.objects.filter(content=tag, mark__owner=owner)
if is_following:
user_owned_entities = user_owned_entities.exclude(mark__visibility__ne=2)
user_owned_entities = user_owned_entities.exclude(mark__visibility=2)
else:
user_owned_entities = user_owned_entities.filter(mark__visibility=0)
return user_owned_entities

View file

@ -66,7 +66,16 @@
{% if movie.director %}{% trans '导演' %}:
{% for director in movie.director %}
<<<<<<< Updated upstream
{{ director }}{% if not forloop.last %} {% endif %}
=======
{% if request.GET.q %}
{{ director | highlight:request.GET.q }}
{% else %}
{{ director }}
{% endif %}
{% if not forloop.last %},{% endif %}
>>>>>>> Stashed changes
{% endfor %}/
{% endif %}