Skip to content

Commit

Permalink
Merge pull request #277 from CalmCrews/fix/detail
Browse files Browse the repository at this point in the history
fix: detail
  • Loading branch information
imjanghyeok authored Jul 7, 2023
2 parents 5cab8b6 + 939de02 commit ccc65e4
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 7 deletions.
5 changes: 2 additions & 3 deletions relanz/community/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -137,20 +137,19 @@ def detail(request, challenge_id, article_id):
like_count = len(Like.objects.filter(article=page_obj.object_list[0]))
author_nickname = page_obj.object_list[0].author.user.nickname
isExist = Like.objects.filter(likedUser=request.user, article=page_obj.object_list[0]).exists()

except PageNotAnInteger:
page = article_num
page_obj = paginator.get_page(page)
like_count = len(Like.objects.filter(article=article))
author_nickname = article.author.user.nickname
isExist = Like.objects.filter(likedUser=request.user, article=article).exists()

except EmptyPage:
page=paginator.num_pages
page_obj=paginator.page(page)
messages.add_message(request, messages.ERROR, '더 이상 인증 글이 없습니다.')

res_data = {'challenge':challenge, 'articles':page_obj, 'like_count':like_count, 'author_nickname':author_nickname, "isExist": isExist, "participant":participant}
res_data = {'challenge':challenge, 'articles':page_obj, 'like_count':like_count, 'author_nickname':author_nickname, "isExist": isExist, "participant":participant, "current":article}
return render(request, 'community/detail.html', res_data)

@csrf_exempt
Expand Down
8 changes: 4 additions & 4 deletions relanz/templates/community/detail.html
Original file line number Diff line number Diff line change
Expand Up @@ -96,12 +96,12 @@
</div>
<div class="nickname-created-div">
<div class="user-nickname">{{author_nickname}} 님</div>
<div class="content-created-at">{{article.created_at}}</div>
<div class="content-created-at">{{current.created_at}}</div>
</div>
</div>
<div class="like-dislike-div">
<span class="like-count" id="like_count">{{like_count}}</span>
<div id="like_count_image_div" data-url="{% url 'community:like' article.id %}" onclick="clickLikeHeartBtn(this)">
<div id="like_count_image_div" data-url="{% url 'community:like' current.id %}" onclick="clickLikeHeartBtn(this)">
<div class="like-img-div">
{% if isExist %}
<div class="like-heart-img-div", id="like_heart_img_div">
Expand All @@ -123,8 +123,8 @@
</div>
</div>
<div class="main-image-div">
{% if article.image %}
<img src="{{article.image.url}}" alt="이미지">
{% if current.image %}
<img src="{{current.image.url}}" alt="이미지">
{% endif %}
</div>
</div>
Expand Down

0 comments on commit ccc65e4

Please sign in to comment.