Skip to content

Commit

Permalink
views: Add notes to patch-detail view
Browse files Browse the repository at this point in the history
The submission template now includes a section to display notes, these
can be filtered out depending if the request user is a maintainer for
the patch's project and on the note maintainer_only attribute

Signed-off-by: andrepapoti <[email protected]>
  • Loading branch information
andrepapoti committed Mar 12, 2024
1 parent d45015b commit d5c5697
Show file tree
Hide file tree
Showing 2 changed files with 27 additions and 0 deletions.
18 changes: 18 additions & 0 deletions patchwork/templates/patchwork/submission.html
Original file line number Diff line number Diff line change
Expand Up @@ -266,6 +266,24 @@ <h2>Message</h2>
</pre>
</div>

{% for note in notes %}
{% if forloop.first %}
<h2>Notes</h2>
{% endif %}
<a name="{{ item.id }}"></a>
<div class="submission-message">
<div class="meta">
{{ note.submitter|personify:project }}
<span class="message-date">
Last modified: {{ note.last_modified }} UTC
</span>
</div>
<pre class="content">
{{ note.content }}
</pre>
</div>
{% endfor %}

{% for item in comments %}
{% if forloop.first %}
<h2>Comments</h2>
Expand Down
9 changes: 9 additions & 0 deletions patchwork/views/patch.py
Original file line number Diff line number Diff line change
Expand Up @@ -122,6 +122,14 @@ def patch_detail(request, project_id, msgid):
'submitter', 'date', 'id', 'content', 'patch', 'addressed'
)

if (
request.user.is_authenticated
and patch.project not in request.user.profile.maintainer_projects.all()
):
notes = patch.note.all()
else:
notes = patch.note.filter(maintainer_only=False)

if patch.related:
related_same_project = patch.related.patches.only(
'name', 'msgid', 'project', 'related'
Expand All @@ -136,6 +144,7 @@ def patch_detail(request, project_id, msgid):
related_same_project = []
related_different_project = []

context['notes'] = notes
context['comments'] = comments
context['checks'] = Patch.filter_unique_checks(
patch.check_set.all().select_related('user'),
Expand Down

0 comments on commit d5c5697

Please sign in to comment.