Skip to content

fix: Update merged code so tests pass #6887

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jennifer-richards merged 3 commits into from
Jan 5, 2024
Merged

fix: Update merged code so tests pass #6887

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d0afbe5
fix: Use refactored method
jennifer-richards Jan 5, 2024
bf042e2
fix: Don't assume user has person
jennifer-richards Jan 5, 2024
a9fe273
fix: Use new view param name
jennifer-richards Jan 5, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions ietf/doc/views_doc.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -287,7 +287,8 @@ def document_main(request, name, rev=None, document_html=False):

presentations = doc.future_presentations()

augment_docs_and_user_with_user_info([doc], request.user)
if request.user.is_authenticated and hasattr(request.user, "person"):
augment_docs_and_person_with_person_info([doc], request.user.person)

exp_comment = doc.latest_event(IanaExpertDocEvent,type="comment")
iana_experts_comment = exp_comment and exp_comment.desc
Expand Down Expand Up @@ -580,7 +581,7 @@ def document_main(request, name, rev=None, document_html=False):
elif can_edit_stream_info and (iesg_state_slug in ('idexists','watching')):
actions.append(("Submit to IESG for Publication", urlreverse('ietf.doc.views_draft.to_iesg', kwargs=dict(name=doc.name))))

if request.user.is_authenticated:
if request.user.is_authenticated and hasattr(request.user, "person"):
augment_docs_and_person_with_person_info([doc], request.user.person)

published = doc.latest_event(type="published_rfc") # todo rethink this now that published_rfc is on rfc
Expand Down
4 changes: 2 additions & 2 deletions ietf/templates/doc/document_rfc.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,14 +129,14 @@
</a>
{% if user.is_authenticated %}
<a class="btn btn-primary btn-sm track-untrack-doc {% if not doc.tracked_in_personal_community_list %}hide{% endif %}"
href="{% url "ietf.community.views.untrack_document" username=user.username name=doc.name %}"
href="{% url "ietf.community.views.untrack_document" email_or_name=user.username name=doc.name %}"
title="Remove from your personal I-D list">
<i class="bi bi-bookmark-check-fill">
</i>
Untrack
</a>
<a class="btn btn-primary btn-sm track-untrack-doc {% if doc.tracked_in_personal_community_list %}hide{% endif %}"
href="{% url "ietf.community.views.track_document" username=user.username name=doc.name %}"
href="{% url "ietf.community.views.track_document" email_or_name=user.username name=doc.name %}"
title="Add to your personal I-D list">
<i class="bi bi-bookmark">
</i>
Expand Down