fix: proper comment editing form for battles and replies

comments/forms.py

@@ -2,6 +2,7 @@
 from django.core.exceptions import ValidationError
 
 from comments.models import Comment
+from posts.models.post import Post
 
 
 class CommentForm(forms.ModelForm):
@@ -111,3 +112,12 @@ def clean(self):
             }
         }
         return cleaned_data
+
+
+def edit_form_class_for_comment(comment):
+    if comment.reply_to:
+        return ReplyForm
+    elif comment.post.type == Post.TYPE_BATTLE:
+        return BattleCommentForm
+    else:
+        return CommentForm

comments/views.py

@@ -9,7 +9,7 @@
 
 from authn.decorators.auth import require_auth
 from club.exceptions import AccessDenied, RateLimitException
-from comments.forms import CommentForm, ReplyForm, BattleCommentForm
+from comments.forms import CommentForm, ReplyForm, BattleCommentForm, edit_form_class_for_comment
 from comments.models import Comment, CommentVote
 from common.request import parse_ip_address, parse_useragent
 from authn.decorators.api import api
@@ -130,11 +130,11 @@ def edit_comment(request, comment_id):
             raise AccessDenied(title="Комментарии к этому посту закрыты")
 
     post = comment.post
+    FormClass = edit_form_class_for_comment(comment)
 
     if request.method == "POST":
-        form = CommentForm(request.POST, instance=comment)
-        if post.type == Post.TYPE_BATTLE:
-            form = BattleCommentForm(request.POST, instance=comment)
+        form = FormClass(request.POST, instance=comment)
+
         if form.is_valid():
             comment = form.save(commit=False)
             comment.is_deleted = False
@@ -147,9 +147,7 @@ def edit_comment(request, comment_id):
 
             return redirect("show_comment", post.slug, comment.id)
     else:
-        form = CommentForm(instance=comment)
-        if post.type == Post.TYPE_BATTLE:
-            form = BattleCommentForm(instance=comment)
+        form = FormClass(instance=comment)
 
     return render(request, "comments/edit.html", {
         "comment": comment,

frontend/html/comments/edit.html

@@ -5,6 +5,10 @@
 {% block content %}
     <div class="content comment">
         <form action="{% url "edit_comment" comment.id %}" method="post" class="form comment-form-form">
+            {% if comment.reply_to_id %}
+                <input type="hidden" name="reply_to_id" value="{{ comment.reply_to_id }}">
+            {% endif %}
+
             <div class="comment-form">
                 <div class="comment-form-body">
                     {% include form|edit_form with post=post form=form comment=comment save_message="Сохранить" %}

frontend/html/comments/forms/battle.html

@@ -4,7 +4,11 @@
     <input type="hidden" name="post_comment_order" value="{{ comment_order }}">
     <div class="comment-form">
         <div class="comment-form-avatar">
-            <div class="avatar"><img src="{{ me.get_avatar }}" alt="Аватар {{ me.full_name }}" loading="lazy" /></div>
+            {% if comment %}
+                <div class="avatar"><img src="{{ comment.author.get_avatar }}" alt="Аватар" loading="lazy" /></div>
+            {% else %}
+                <div class="avatar"><img src="{{ me.get_avatar }}" alt="Аватар" loading="lazy" /></div>
+            {% endif %}
         </div>
         <div class="comment-form-body comment-form-battle">
             <div class="comment-form-body-battle-side">Я за
@@ -28,12 +32,14 @@
                         <i class="fa fa-image"></i>
                     </label>
                     <div class="comment-form-subscribe">
-                        {{ form.subscribe_to_post }} {{ form.subscribe_to_post.label_tag }}
+                        {% if not comment %}
+                            {{ form.subscribe_to_post }} {{ form.subscribe_to_post.label_tag }}
+                        {% endif %}
                     </div>
-                    <button type="submit" class="button comment-form-button"> {{save_message}} </button>
+                    <button type="submit" class="button comment-form-button"> {{ save_message }} </button>
                 </div>
             </div>
-            {% if form.text.errors %}<span class="form-errors">{{ form.full_name.errors }}</span>{% endif %}
+            {% if form.errors %}<span class="form-errors">{{ form.errors }}</span>{% endif %}
         </div>
     </div>
 </form>

frontend/html/comments/forms/comment.html

@@ -2,7 +2,11 @@
     <input type="hidden" name="post_comment_order" value="{{ comment_order }}">
     <div class="comment-form">
         <div class="comment-form-avatar">
-            <div class="avatar"><img src="{{ me.get_avatar }}" alt="Аватар {{ me.full_name }}" loading="lazy" /></div>
+            {% if comment %}
+                <div class="avatar"><img src="{{ comment.author.get_avatar }}" alt="Аватар" loading="lazy" /></div>
+            {% else %}
+                <div class="avatar"><img src="{{ me.get_avatar }}" alt="Аватар" loading="lazy" /></div>
+            {% endif %}
         </div>
         <div class="comment-form-body comment-form-editor-container">
             <comment-markdown-editor class="comment-form-body-text" post-slug="{{ post.slug }}"
@@ -17,11 +21,13 @@
                     <i class="fa fa-image"></i>
                 </label>
                 <div class="comment-form-subscribe">
-                    {{ form.subscribe_to_post }} {{ form.subscribe_to_post.label_tag }}
+                    {% if not comment %}
+                        {{ form.subscribe_to_post }} {{ form.subscribe_to_post.label_tag }}
+                    {% endif %}
                 </div>
                 <button type="submit" class="button comment-form-button">{{ save_message }}</button>
             </div>
-            {% if form.text.errors %}<span class="form-errors">{{ form.full_name.errors }}</span>{% endif %}
+            {% if form.errors %}<span class="form-errors">{{ form.errors }}</span>{% endif %}
         </div>
     </div>
 </form>