Skip to content
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.

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

refactor: don't template inside <script> #8480

Merged
merged 1 commit into from
Jan 29, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
refactor: don't template inside <script>
  • Loading branch information
jennifer-richards committed Jan 29, 2025
commit 099df4c68dd59a04cc2829c688985a2566ce666f
4 changes: 3 additions & 1 deletion ietf/static/js/complete-review.js
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,8 @@ $(document)
.before(mailArchiveSearchTemplate);

var mailArchiveSearch = form.find(".mail-archive-search");
const isReviewer = mailArchiveSearch.data('isReviewer');
const searchMailArchiveUrl = mailArchiveSearch.data('searchMailArchiveUrl');

var retrievingData = null;

Expand Down Expand Up @@ -190,4 +192,4 @@ $(document)
form.find("[name=review_submission][value=link]")
.trigger("click");
}
});
});
16 changes: 7 additions & 9 deletions ietf/templates/doc/review/complete_review.html
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,13 @@ <h1>
{% endif %}
<div class="template d-none">
{% if mail_archive_query_urls %}
<div class="mail-archive-search">
<div class="mail-archive-search"
{% if assignment %}
data-search-mail-archive-url="{% url "ietf.doc.views_review.search_mail_archive" name=doc.name assignment_id=assignment.pk %}"
{% else %}
data-search-mail-archive-url="{% url "ietf.doc.views_review.search_mail_archive" name=doc.name acronym=team.acronym %}"
{% endif %}
data-is-reviewer="{{ is_reviewer|yesno:"true,false" }}">
<div class="offset-md-2 col-md-10">
<label for="mail-archive-subjects" class="form-label">Search {{team.list_email}} mail archive subjects for:</label>
<div class="input-group mb-3">
Expand Down Expand Up @@ -144,13 +150,5 @@ <h1>
{% endblock %}
{% block js %}
<script src="{% static 'ietf/js/datepicker.js' %}"></script>
<script>
{% if assignment %}
var searchMailArchiveUrl = "{% url "ietf.doc.views_review.search_mail_archive" name=doc.name assignment_id=assignment.pk %}";
{% else %}
var searchMailArchiveUrl = "{% url "ietf.doc.views_review.search_mail_archive" name=doc.name acronym=team.acronym %}";
{% endif %}
var isReviewer = {{ is_reviewer|yesno:'true,false' }};
</script>
<script src="{% static 'ietf/js/complete-review.js' %}"></script>
{% endblock %}
Loading