show movie review/mark from same imdb
This commit is contained in:
parent
7b18ef9c3b
commit
e99ed63019
5 changed files with 29 additions and 4 deletions
|
@ -208,6 +208,15 @@ class Movie(Entity):
|
|||
qs = qs & ~Q(id=self.id)
|
||||
return Movie.objects.filter(qs).order_by('season')
|
||||
|
||||
def get_identicals(self):
|
||||
qs = Q(orig_title=self.title)
|
||||
if self.imdb_code:
|
||||
qs = Q(imdb_code=self.imdb_code)
|
||||
# qs = qs & ~Q(id=self.id)
|
||||
return Movie.objects.filter(qs)
|
||||
else:
|
||||
return [self] # Book.objects.filter(id=self.id)
|
||||
|
||||
@property
|
||||
def verbose_category_name(self):
|
||||
if self.is_series:
|
||||
|
|
|
@ -268,6 +268,10 @@
|
|||
<span class="icon-lock"><svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20"><path d="M17,8.48h-.73V6.27a6.27,6.27,0,1,0-12.53,0V8.48H3a.67.67,0,0,0-.67.67V19.33A.67.67,0,0,0,3,20H17a.67.67,0,0,0,.67-.67V9.15A.67.67,0,0,0,17,8.48ZM6.42,6.27h0a3.57,3.57,0,0,1,7.14,0h0V8.48H6.42Z"/></svg></span>
|
||||
{% endif %}
|
||||
<span class="entity-marks__mark-time">{{ others_mark.edited_time }}</span>
|
||||
{% if others_mark.movie != movie %}
|
||||
<span class="entity-marks__mark-time source-label"><a class="entity-marks__mark-time" href="{% url 'movies:retrieve' others_mark.movie.id %}">{{ others_mark.movie.get_source_site_display }}</a></span>
|
||||
{% endif %}
|
||||
|
||||
{% if others_mark.text %}
|
||||
<p class="entity-marks__mark-content">{{ others_mark.text }}</p>
|
||||
{% endif %}
|
||||
|
@ -297,6 +301,10 @@
|
|||
<span class="icon-lock"><svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20"><path d="M17,8.48h-.73V6.27a6.27,6.27,0,1,0-12.53,0V8.48H3a.67.67,0,0,0-.67.67V19.33A.67.67,0,0,0,3,20H17a.67.67,0,0,0,.67-.67V9.15A.67.67,0,0,0,17,8.48ZM6.42,6.27h0a3.57,3.57,0,0,1,7.14,0h0V8.48H6.42Z"/></svg></span>
|
||||
{% endif %}
|
||||
<span class="entity-reviews__review-time">{{ others_review.edited_time }}</span>
|
||||
{% if others_review.movie != movie %}
|
||||
<span class="entity-reviews__review-time source-label"><a class="entity-reviews__review-time" href="{% url 'movies:retrieve' others_review.movie.id %}">{{ others_review.movie.get_source_site_display }}</a></span>
|
||||
{% endif %}
|
||||
|
||||
<span class="entity-reviews__review-title"> <a href="{% url 'movies:retrieve_review' others_review.id %}">{{ others_review.title }}</a></span>
|
||||
<span>{{ others_review.get_plain_content | truncate:100 }}</span>
|
||||
</li>
|
||||
|
|
|
@ -54,6 +54,11 @@
|
|||
</svg></span>
|
||||
{% endif %}
|
||||
<span class="entity-marks__mark-time">{{ mark.edited_time }}</span>
|
||||
<span class="entity-marks__mark-time">{{ mark.edited_time }}</span>
|
||||
{% if mark.movie != movie %}
|
||||
<span class="entity-marks__mark-time source-label"><a class="entity-marks__mark-time" href="{% url 'movies:retrieve' mark.movie.id %}">{{ mark.movie.get_source_site_display }}</a></span>
|
||||
{% endif %}
|
||||
|
||||
{% if mark.text %}
|
||||
<p class="entity-marks__mark-content">{{ mark.text }}</p>
|
||||
{% endif %}
|
||||
|
|
|
@ -46,6 +46,9 @@
|
|||
<span class="icon-lock"><svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 20 20"><path d="M17,8.48h-.73V6.27a6.27,6.27,0,1,0-12.53,0V8.48H3a.67.67,0,0,0-.67.67V19.33A.67.67,0,0,0,3,20H17a.67.67,0,0,0,.67-.67V9.15A.67.67,0,0,0,17,8.48ZM6.42,6.27h0a3.57,3.57,0,0,1,7.14,0h0V8.48H6.42Z"/></svg></span>
|
||||
{% endif %}
|
||||
<span class="entity-reviews__review-time">{{ review.edited_time }}</span>
|
||||
{% if review.movie != movie %}
|
||||
<span class="entity-reviews__review-time source-label"><a class="entity-reviews__review-time" href="{% url 'movies:retrieve' review.movie.id %}">{{ review.movie.get_source_site_display }}</a></span>
|
||||
{% endif %}
|
||||
|
||||
|
||||
<span href="{% url 'movies:retrieve_review' review.id %}" class="entity-reviews__review-title"><a href="{% url 'movies:retrieve_review' review.id %}">{{ review.title }}</a></span>
|
||||
|
|
|
@ -187,8 +187,8 @@ def retrieve(request, id):
|
|||
mark_list_more = None
|
||||
review_list_more = None
|
||||
else:
|
||||
mark_list = MovieMark.get_available(movie, request.user)
|
||||
review_list = MovieReview.get_available(movie, request.user)
|
||||
mark_list = MovieMark.get_available_for_identicals(movie, request.user)
|
||||
review_list = MovieReview.get_available_for_identicals(movie, request.user)
|
||||
mark_list_more = True if len(mark_list) > MARK_NUMBER else False
|
||||
mark_list = mark_list[:MARK_NUMBER]
|
||||
for m in mark_list:
|
||||
|
@ -342,7 +342,7 @@ def create_update_mark(request):
|
|||
def retrieve_mark_list(request, movie_id, following_only=False):
|
||||
if request.method == 'GET':
|
||||
movie = get_object_or_404(Movie, pk=movie_id)
|
||||
queryset = MovieMark.get_available(movie, request.user, following_only=following_only)
|
||||
queryset = MovieMark.get_available_for_identicals(movie, request.user, following_only=following_only)
|
||||
paginator = Paginator(queryset, MARK_PER_PAGE)
|
||||
page_number = request.GET.get('page', default=1)
|
||||
marks = paginator.get_page(page_number)
|
||||
|
@ -549,7 +549,7 @@ def retrieve_review(request, id):
|
|||
def retrieve_review_list(request, movie_id):
|
||||
if request.method == 'GET':
|
||||
movie = get_object_or_404(Movie, pk=movie_id)
|
||||
queryset = MovieReview.get_available(movie, request.user)
|
||||
queryset = MovieReview.get_available_for_identicals(movie, request.user)
|
||||
paginator = Paginator(queryset, REVIEW_PER_PAGE)
|
||||
page_number = request.GET.get('page', default=1)
|
||||
reviews = paginator.get_page(page_number)
|
||||
|
|
Loading…
Add table
Reference in a new issue