* chore: Remove unused "rendertest" stuff (#6015) * fix: restore ability to create status change documents (#5963) * fix: restore ability to create status change documents Fixes #5962 * chore: address review comment * fix: Provide human-friendly status in submission status API response (#6011) Co-authored-by: nectostr <bastinda96@gmail.com> * fix: Make name/email lookups case-insensitive (#5972) (#6007) * fix: Make name/email lookups case-insensitive (#5972) Use icontains so that looking up name or email is case insensitive Added a test Fixes: 5972 * fix: Use __iexact not __icontains * fix: Clarify no-action-needed (#5918) (#6020) When a draft is submitted for manual processing, clarify that no action is needed; the Secretariat has the next steps. Fixes: #5918 * fix: Fix menu hover issue (#6019) * fix: Fix menu hover issue Fixes #5702 * Fix leftmenu hover issue * fix: Server error from api_get_session_materials() (#6025) Fixes #5877 * fix: Clarify Questionnaire label (#4688) (#6017) When filtering nominees, `Questionnaire` implies `Accepted == yes` so fix the dropdown test tosay that. Fixes: #4688 * chore: Merge from @martinthomson's rfc-txt-html (#6023) * fix:no history entry when changing RFC Editor note for doc (#6021) * fix:no history entry when changing RFC Editor note for doc * fix:no history entry when changing RFC Editor note for doc --------- Co-authored-by: Priyanka Narkar <priyankanarkar@dhcp-91f8.meeting.ietf.org> * fix: avoid deprecation warning on view_list() for objs without CommunityList Fixes #5942 * fix: return 404 for non-existing revisions (#6014) * fix: return 404 for non-existing revisions Links to non-existing revisions to docs should return 404 * fix: change rfc/rev and search behaviour * refactor: fix tab level * fix: return 404 for rfc revision for bibtex * fix: provide date for revisions in bibtex output (#6029) * fix: provide date for revisions in bibtex output * refactor: change walrus to if's * fix: specify particular revision for events * fix: review refactoring issue fixes #5447 * fix: Remove automatically suggested document for document that is already has review request (fixes #3211) (#5425) * Added check that if there is already review request for the document in question, ignore the automatic suggestion for that document. Fixes #3211. * fix: dont block on open requests for a previous version. Add tests --------- Co-authored-by: Nicolas Giard <github@ngpixel.com> Co-authored-by: Robert Sparks <rjsparks@nostrum.com> * feat: IAB statements (#5940) * feat: support iab and iesg statements. Import iab statements. (#5895) * feat: infrastructure for statements doctype * chore: basic test framework * feat: basic statement document view * feat: show replaced statements * chore: black * fix: state help for statements * fix: cleanout non-relevant email expansions * feat: import iab statements, provide group statements tab * fix: guard against running import twice * feat: build redirect csv for iab statements * fix: set document state on import * feat: show published date on main doc view * feat: handle pdf statements * feat: create new and update statements * chore: copyright block updates * chore: remove flakes * chore: black * feat: add edit/new buttons for the secretariat * fix: address PR #5895 review comments * fix: pin pydantic until inflect catches up (#5901) (#5902) * chore: re-un-pin pydantic * feat: include submitter in email about submitted slides (#6033) * feat: include submitter in email about submitted slides fixes #6031 * chore: remove unintended whitespace change * chore(dev): update .vscode/settings.json with new taskExplorer settings * fix: Add editorial stream to proceedings (#6027) * fix: Add editorial stream to proceedings Fixes #5717 * fix: Move editorial stream after the irtf in proceedings * fix: Add editorial stream to meeting materials (#6047) Fixes #6042 * fix: Shows requested reviews for doc fixes (#6022) * Fix: Shows requested reviews for doc * Changed template includes to only give required variables to them. * feat: allow openId to choose an unactive email if there are none active (#6041) * feat: allow openId to choose an unactive email if there are no active ones * chore: correct typo * chore: rename unactive to inactive * fix: Make review table more responsive (#6053) * fix: Improve layout of review table * Progress * Progress * Final changes * Fix tests * Remove fluff * Undo commits * ci: add --validate-html-harder to tests * ci: add --validate-html-harder to build.yml workflow * fix: Set colspan to actual number of columns (#6069) * fix: Clean up view_feedback_pending (#6070) - Remove "Unclassified" column header, which caused misalignment in the table body. - Show the message author - previously displayed as `(None)`. * docs: Update LICENSE year * fix: Remove IESG state edit button when state is 'dead' (#6051) (#6065) * fix: Correctly order "last call requested" column in the IESG dashboard (#6079) * ci: update dev sandbox init script to start memcached * feat: Reclassify nomcom feedback (#6002) * fix: Clean up view_feedback_pending - Remove "Unclassified" column header, which caused misalignment in the table body. - Show the message author - previously displayed as `(None)`. * feat: Reclassify nomcom feedback (#4669) - There's a new `Chair/Advisor Tasks` menu item `Reclassify feedback`. - I overloaded `view_feedback*` URLs with a `?reclassify` parameter. - This adds a checkbox to each feedback message, and a `Reclassify` button at the bottom of each feedback page. - "Reclassifying" basically de-classifies the feedback, and punts it back to the "Pending emails" view for reclassification. - If a feedback has been applied to multiple nominees, declassifying it from one nominee removes it from all. * fix: Remove unused local variables * fix: Fix some missing and mis-nested html * test: Add tests for reclassifying feedback * refactor: Substantial redesign of feedback reclassification - Break out reclassify_feedback* as their own URLs and views, and revert changes to view_feedback*.html. - Replace checkboxes with a Reclassify button on each message. * fix: Remember to clear the feedback associations when reclassifying * feat: Add an 'Overcome by events' feedback type * refactor: When invoking reclassification from a view-feedback page, load the corresponding reclassify-feedback page * fix: De-conflict migration with 0004_statements Also change the coding style to match, and add a reverse migration. * fix: Fix a test case to account for new feedback type * fix: 842e730 broke the Back button * refactor: Reclassify feedback directly instead of putting it back in the work queue * fix: Adjust tests to new workflow * refactor: Further refine reclassification to avoid redirects * refactor: Impose a FeedbackTypeName ordering Also add FeedbackTypeName.legend field, rather than synthesizing it every time we classify or reclassify feedback. In the reclassification forms, only show the relevant feedback types. * refactor: Merge reclassify_feedback_* back into view_feedback_* This means the "Reclassify" button is always present, but eliminates some complexity. * refactor: Add filter(used=True) on FeedbackTypeName querysets * refactor: Add the new FeedbackTypeName to the reclassification success message * fix: Secure reclassification against rogue nomcom members * fix: Print decoded key and fully clean up test nomcom (#6094) * fix: Delete Person records when deleting a test nomcom * fix: Decode test nomcom private key before printing * test: Use correct time zone for test_statement_doc_view (#6064) * chore(deps): update all npm dependencies for playwright (#6061) Co-authored-by: depfu[bot] <23717796+depfu[bot]@users.noreply.github.com> * chore(deps): update all npm dependencies for dev/diff (#6062) Co-authored-by: depfu[bot] <23717796+depfu[bot]@users.noreply.github.com> * chore(deps): update all npm dependencies for dev/coverage-action (#6063) Co-authored-by: depfu[bot] <23717796+depfu[bot]@users.noreply.github.com> * fix: Hash cache key for default memcached cache (#6089) * feat: Show docs that an AD hasn't balloted on that need ballots to progress (#6075) * fix(doc): Unify help texts for document states (#6060) * Fix IESG State help text link (only) * Intermediate checkpoint * Correct URL filtering of state descriptions * Unify help texts for document states * Remove redundant load static from template --------- Co-authored-by: Robert Sparks <rjsparks@nostrum.com> * ci: fix sandbox start.sh memcached user * fix: refactor how settings handles cache definitions (#6099) * fix: refactor how settings handles cache definitions * chore: more english-speaker readable expression * fix: Cast cache key to str before calling encode (#6100) --------- Co-authored-by: Robert Sparks <rjsparks@nostrum.com> Co-authored-by: Liubov Kurafeeva <liubov.kurafeeva@gmail.com> Co-authored-by: nectostr <bastinda96@gmail.com> Co-authored-by: Rich Salz <rsalz@akamai.com> Co-authored-by: PriyankaN <priyanka@amsl.com> Co-authored-by: Priyanka Narkar <priyankanarkar@dhcp-91f8.meeting.ietf.org> Co-authored-by: Ali <alireza83@gmail.com> Co-authored-by: Roman Beltiukov <maybe.hello.world@gmail.com> Co-authored-by: Tero Kivinen <kivinen@iki.fi> Co-authored-by: Nicolas Giard <github@ngpixel.com> Co-authored-by: Kesara Rathnayake <kesara@fq.nz> Co-authored-by: Jennifer Richards <jennifer@staff.ietf.org> Co-authored-by: Paul Selkirk <paul@painless-security.com> Co-authored-by: depfu[bot] <23717796+depfu[bot]@users.noreply.github.com> Co-authored-by: Jim Fenton <fenton@bluepopcorn.net>
275 lines
11 KiB
Python
275 lines
11 KiB
Python
# Copyright The IETF Trust 2023, All Rights Reserved
|
|
|
|
import debug # pyflakes: ignore
|
|
|
|
from pathlib import Path
|
|
|
|
from django import forms
|
|
from django.conf import settings
|
|
from django.http import FileResponse, Http404
|
|
from django.views.decorators.cache import cache_control
|
|
from django.shortcuts import get_object_or_404, render, redirect
|
|
from django.template.loader import render_to_string
|
|
from ietf.utils import markdown
|
|
from django.utils.html import escape
|
|
|
|
from ietf.doc.models import Document, DocAlias, DocEvent, NewRevisionDocEvent, State
|
|
from ietf.group.models import Group
|
|
from ietf.ietfauth.utils import role_required
|
|
from ietf.utils.text import xslugify
|
|
from ietf.utils.textupload import get_cleaned_text_file_content
|
|
|
|
CONST_PDF_REV_NOTICE = "The current revision of this statement is in pdf format"
|
|
|
|
|
|
@cache_control(max_age=3600)
|
|
def serve_pdf(self, name, rev=None):
|
|
doc = get_object_or_404(Document, name=name)
|
|
if rev is None:
|
|
rev = doc.rev
|
|
p = Path(doc.get_file_path()).joinpath(f"{doc.name}-{rev}.pdf")
|
|
if not p.exists():
|
|
raise Http404
|
|
else:
|
|
return FileResponse(p.open(mode="rb"), content_type="application/pdf")
|
|
|
|
|
|
class StatementUploadForm(forms.Form):
|
|
ACTIONS = [
|
|
("enter", "Enter content directly"),
|
|
("upload", "Upload content from file"),
|
|
]
|
|
statement_submission = forms.ChoiceField(choices=ACTIONS, widget=forms.RadioSelect)
|
|
statement_file = forms.FileField(
|
|
label="Markdown or PDF source file to upload", required=False
|
|
)
|
|
statement_content = forms.CharField(
|
|
widget=forms.Textarea(attrs={"rows": 30}), required=False, strip=False
|
|
)
|
|
|
|
def clean(self):
|
|
def require_field(f):
|
|
if not self.cleaned_data.get(f):
|
|
self.add_error(f, forms.ValidationError("You must fill in this field."))
|
|
return False
|
|
else:
|
|
return True
|
|
|
|
submission_method = self.cleaned_data.get("statement_submission")
|
|
markdown_content = ""
|
|
if submission_method == "enter":
|
|
if require_field("statement_content"):
|
|
markdown_content = self.cleaned_data["statement_content"].replace(
|
|
"\r", ""
|
|
)
|
|
default_content = render_to_string(
|
|
"doc/statement/statement_template.md", {}
|
|
)
|
|
if markdown_content == default_content:
|
|
raise forms.ValidationError(
|
|
"The example content may not be saved. Edit it to contain the next revision statement content."
|
|
)
|
|
if markdown_content == CONST_PDF_REV_NOTICE:
|
|
raise forms.ValidationError(
|
|
"Not proceeding with the text noting that the current version is pdf. Did you mean to upload a new PDF?"
|
|
)
|
|
elif submission_method == "upload":
|
|
if require_field("statement_file"):
|
|
content_type = self.cleaned_data["statement_file"].content_type
|
|
acceptable_types = (
|
|
"application/pdf",
|
|
) + settings.DOC_TEXT_FILE_VALID_UPLOAD_MIME_TYPES
|
|
if not content_type.startswith(
|
|
acceptable_types
|
|
): # dances around decoration of types with encoding etc.
|
|
self.add_error(
|
|
"statement_file",
|
|
forms.ValidationError(
|
|
f"Unexpected content type: Expected one of {', '.join(acceptable_types)}"
|
|
),
|
|
)
|
|
elif content_type != "application/pdf":
|
|
markdown_content = get_cleaned_text_file_content(
|
|
self.cleaned_data["statement_file"]
|
|
)
|
|
if markdown_content != "":
|
|
try:
|
|
_ = markdown.markdown(markdown_content)
|
|
except Exception as e:
|
|
raise forms.ValidationError(f"Markdown processing failed: {e}")
|
|
|
|
|
|
@role_required("Secretariat")
|
|
def submit(request, name):
|
|
statement = get_object_or_404(Document, type="statement", name=name)
|
|
|
|
if request.method == "POST":
|
|
form = StatementUploadForm(request.POST, request.FILES)
|
|
if form.is_valid():
|
|
statement_submission = form.cleaned_data["statement_submission"]
|
|
writing_pdf = (
|
|
statement_submission == "upload"
|
|
and form.cleaned_data["statement_file"].content_type
|
|
== "application/pdf"
|
|
)
|
|
|
|
statement.rev = "%02d" % (int(statement.rev) + 1)
|
|
statement.uploaded_filename = (
|
|
f"{statement.name}-{statement.rev}.{'pdf' if writing_pdf else 'md'}"
|
|
)
|
|
e = NewRevisionDocEvent.objects.create(
|
|
type="new_revision",
|
|
doc=statement,
|
|
by=request.user.person,
|
|
rev=statement.rev,
|
|
desc="New revision available",
|
|
)
|
|
statement.save_with_history([e])
|
|
markdown_content = ""
|
|
if statement_submission == "upload":
|
|
if not writing_pdf:
|
|
markdown_content = get_cleaned_text_file_content(
|
|
form.cleaned_data["statement_file"]
|
|
)
|
|
else:
|
|
markdown_content = form.cleaned_data["statement_content"]
|
|
with Path(statement.get_file_name()).open(
|
|
mode="wb" if writing_pdf else "w"
|
|
) as destination:
|
|
if writing_pdf:
|
|
for chunk in form.cleaned_data["statement_file"].chunks():
|
|
destination.write(chunk)
|
|
else:
|
|
destination.write(markdown_content)
|
|
return redirect("ietf.doc.views_doc.document_main", name=statement.name)
|
|
|
|
else:
|
|
if statement.uploaded_filename.endswith("pdf"):
|
|
text = CONST_PDF_REV_NOTICE
|
|
else:
|
|
text = statement.text_or_error()
|
|
init = {
|
|
"statement_content": text,
|
|
"statement_submission": "enter",
|
|
}
|
|
form = StatementUploadForm(initial=init)
|
|
return render(
|
|
request, "doc/statement/upload_content.html", {"form": form, "doc": statement}
|
|
)
|
|
|
|
|
|
class NewStatementForm(StatementUploadForm):
|
|
group = forms.ModelChoiceField(
|
|
queryset=Group.objects.filter(acronym__in=["iab", "iesg"])
|
|
)
|
|
title = forms.CharField(max_length=255)
|
|
field_order = [
|
|
"group",
|
|
"title",
|
|
"statement_submission",
|
|
"statement_file",
|
|
"statement_content",
|
|
]
|
|
|
|
def name_from_title_and_group(self, title, group):
|
|
title_slug = xslugify(title)
|
|
if title_slug.startswith(f"{group.acronym}-"):
|
|
title_slug = title_slug[len(f"{group.acronym}-") :]
|
|
name = f"statement-{group.acronym}-{title_slug[:240]}"
|
|
return name.replace("_", "-")
|
|
|
|
def clean(self):
|
|
if all([field in self.cleaned_data for field in ["title", "group"]]):
|
|
title = self.cleaned_data["title"]
|
|
group = self.cleaned_data["group"]
|
|
name = self.name_from_title_and_group(title, group)
|
|
if name == self.name_from_title_and_group("", group):
|
|
self.add_error(
|
|
"title",
|
|
forms.ValidationError(
|
|
"The filename derived from this title is empty. Please include a few descriptive words using ascii or numeric characters"
|
|
),
|
|
)
|
|
if Document.objects.filter(name=name).exists():
|
|
self.add_error(
|
|
"title",
|
|
forms.ValidationError(
|
|
"This title produces a filename already used by an existing statement"
|
|
),
|
|
)
|
|
return super().clean()
|
|
|
|
|
|
@role_required("Secretariat")
|
|
def new_statement(request):
|
|
if request.method == "POST":
|
|
form = NewStatementForm(request.POST, request.FILES)
|
|
if form.is_valid():
|
|
statement_submission = form.cleaned_data["statement_submission"]
|
|
writing_pdf = (
|
|
statement_submission == "upload"
|
|
and form.cleaned_data["statement_file"].content_type
|
|
== "application/pdf"
|
|
)
|
|
|
|
group = form.cleaned_data["group"]
|
|
title = form.cleaned_data["title"]
|
|
name = form.name_from_title_and_group(title, group)
|
|
statement = Document.objects.create(
|
|
type_id="statement",
|
|
group=group,
|
|
name=name,
|
|
title=title,
|
|
abstract="",
|
|
rev="00",
|
|
uploaded_filename=f"{name}-00.{'pdf' if writing_pdf else 'md'}",
|
|
)
|
|
statement.set_state(State.objects.get(type_id="statement", slug="active"))
|
|
e1 = NewRevisionDocEvent.objects.create(
|
|
type="new_revision",
|
|
doc=statement,
|
|
by=request.user.person,
|
|
rev=statement.rev,
|
|
desc="New revision available",
|
|
time=statement.time,
|
|
)
|
|
e2 = DocEvent.objects.create(
|
|
type="published_statement",
|
|
doc=statement,
|
|
rev=statement.rev,
|
|
by=request.user.person,
|
|
desc="Statement published",
|
|
)
|
|
statement.save_with_history([e1, e2])
|
|
alias = DocAlias.objects.create(name=name)
|
|
alias.docs.set([statement])
|
|
markdown_content = ""
|
|
if statement_submission == "upload":
|
|
if not writing_pdf:
|
|
markdown_content = get_cleaned_text_file_content(
|
|
form.cleaned_data["statement_file"]
|
|
)
|
|
else:
|
|
markdown_content = form.cleaned_data["statement_content"]
|
|
with Path(statement.get_file_name()).open(
|
|
mode="wb" if writing_pdf else "w"
|
|
) as destination:
|
|
if writing_pdf:
|
|
for chunk in form.cleaned_data["statement_file"].chunks():
|
|
destination.write(chunk)
|
|
else:
|
|
destination.write(markdown_content)
|
|
return redirect("ietf.doc.views_doc.document_main", name=statement.name)
|
|
|
|
else:
|
|
init = {
|
|
"statement_content": escape(
|
|
render_to_string(
|
|
"doc/statement/statement_template.md", {"settings": settings}
|
|
)
|
|
),
|
|
"statement_submission": "enter",
|
|
}
|
|
form = NewStatementForm(initial=init)
|
|
return render(request, "doc/statement/new_statement.html", {"form": form})
|