diff --git a/blog/blog/settings.py b/blog/blog/settings.py index b7a7e92..eb1af4a 100644 --- a/blog/blog/settings.py +++ b/blog/blog/settings.py @@ -109,7 +109,7 @@ AUTH_PASSWORD_VALIDATORS = [ LANGUAGE_CODE = "en-us" -TIME_ZONE = "UTC" +TIME_ZONE = "Europe/Moscow" USE_I18N = True diff --git a/blog/comments/models.py b/blog/comments/models.py index d067d97..d673a0e 100644 --- a/blog/comments/models.py +++ b/blog/comments/models.py @@ -56,4 +56,4 @@ class Comment(models.Model): return False def __str__(self): - return f"{self.author_name}: {self.comment_text[:100]}" + return f"{self.nickname}: {self.comment_text[:100]}" diff --git a/blog/comments/views.py b/blog/comments/views.py index da6d982..88918bc 100644 --- a/blog/comments/views.py +++ b/blog/comments/views.py @@ -51,8 +51,10 @@ def leave_comment(request, post_id): comment_text=request.POST["text"], reply=parent, ) + response = HttpResponseRedirect(reverse("posts:detail", args=(post.id,))) + response.set_cookie("nickname", nickname, max_age=300) - return HttpResponseRedirect(reverse("posts:detail", args=(post.id,))) + return response def get_or_create_author(name: str, secret: str) -> Union[CommentAuthor, None]: diff --git a/blog/posts/templates/posts/post.html b/blog/posts/templates/posts/post.html index fd009c8..77ec92c 100644 --- a/blog/posts/templates/posts/post.html +++ b/blog/posts/templates/posts/post.html @@ -58,7 +58,7 @@
- +
diff --git a/blog/posts/views.py b/blog/posts/views.py index 42702c5..feae15a 100644 --- a/blog/posts/views.py +++ b/blog/posts/views.py @@ -19,8 +19,16 @@ def detail(request, post_id): post = get_object_or_404(Post, pk=post_id) comments = post.comment_set.all() comments_count = comments.count() + nickname = ( + request.COOKIES.get("nickname") if request.COOKIES.get("nickname") else "" + ) return render( request, "posts/post.html", - {"post": post, "comments": comments, "comments_count": comments_count}, + { + "post": post, + "comments": comments, + "comments_count": comments_count, + "nickname": nickname, + }, )