klmp200/Sith
1
0
Fork 0
mirror of https://github.com/ae-utbm/sith.git synced 2024-11-26 11:04:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

pedagogy: fix error with author change on comment when edited by an admin

Browse Source
This commit is contained in:
Antoine Bartuccio 2019-06-16 18:34:11 +02:00
parent 8512f3c5d0
commit c467165bf3
Signed by: klmp200
GPG Key ID: E7245548C53F904B
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pedagogy/templates/pedagogy/uv_detail.jinja
View File

@ -21,6 +21,7 @@
<p>{{ comment.grade_work_load }}</p> <p>{{ comment.grade_work_load }}</p>
<p>{{ comment.comment }}</p> <p>{{ comment.comment }}</p>
<p>{% trans %}Published: {% endtrans %}{{ comment.publish_date }}</p> <p>{% trans %}Published: {% endtrans %}{{ comment.publish_date }}</p>
<p>{% trans %}Author: {% endtrans %}{{ comment.author }}</p>
{% if user.is_owner(comment) %} {% if user.is_owner(comment) %}
<p><a href="{{ url('pedagogy:comment_edit', comment_id=comment.id) }}">{% trans %}Edit{% endtrans %}</a></p> <p><a href="{{ url('pedagogy:comment_edit', comment_id=comment.id) }}">{% trans %}Edit{% endtrans %}</a></p>
<p><a href="{{ url('pedagogy:comment_delete', comment_id=comment.id) }}">{% trans %}Delete{% endtrans %}</a></p> <p><a href="{{ url('pedagogy:comment_delete', comment_id=comment.id) }}">{% trans %}Delete{% endtrans %}</a></p>

5
pedagogy/views.py
View File

@ -110,8 +110,9 @@ class UVCommentUpdateView(CanEditPropMixin, UpdateView):
def get_form_kwargs(self): def get_form_kwargs(self):
kwargs = super(UVCommentUpdateView, self).get_form_kwargs() kwargs = super(UVCommentUpdateView, self).get_form_kwargs()
kwargs["author_id"] = self.request.user.id obj = self.get_object()
kwargs["uv_id"] = self.get_object().uv.id kwargs["author_id"] = obj.author.id
kwargs["uv_id"] = obj.uv.id
return kwargs return kwargs