s) that are containers (i.e.,
+ * parents) of timeslots (elements with the "timeslot" class). Sort these containers based on whether
+ * their room has at least one timeslot visible - if so, we will show it, if not it will be hidden.
+ * This will hide containers both in the day-flow and room label sections, so it will hide the room
+ * labels for rooms with no visible timeslots. */
+ schedEditor.find('.timeslots').each((_, e) => {
+ if (roomsWithVisibleSlots.indexOf(e.dataset.roomId) === -1) {
+ tsContainers.toHide.push(e);
+ } else {
+ tsContainers.toShow.push(e);
+ }
+ });
+
+ /* Now check whether each room group has any rooms not being hidden. If not, entirely hide the
+ * room group so that all its headers, etc, do not take up space. */
+ schedEditor.find('.room-group').each((_, e) => {
+ if (jQuery(e).has(tsContainers.toShow).length > 0) {
+ roomGroups.toShow.push(e);
+ } else {
+ roomGroups.toHide.push(e);
+ }
+ });
+ jQuery(roomGroups.toShow).show();
+ jQuery(roomGroups.toHide).hide();
+ jQuery(tsContainers.toShow).show();
+ jQuery(tsContainers.toHide).hide();
+ }
+
+ /**
+ * Update visibility of UI elements
+ *
+ * Call this after changing 'hidden-*' classes on timeslots
+ */
+ function updateGridVisibility() {
+ updateTimeSlotVisibility();
+ updateSessionVisibility();
+ updateHeaderVisibility();
+ updateRoomVisibility();
+ updateTimeSlotOptions();
+ updateSessionPurposeOptions();
+ schedEditor.find('div.edit-grid').removeClass('hidden');
+ }
+
timeSlotGroupInputs.on("click change", updateTimeSlotGroupToggling);
- content.find('#timeslot-group-toggles-modal .timeslot-group-buttons .select-all').get(0).addEventListener(
- 'click',
- function() {
- timeSlotGroupInputs.prop('checked', true);
- updateTimeSlotGroupToggling();
- });
- content.find('#timeslot-group-toggles-modal .timeslot-group-buttons .clear-all').get(0).addEventListener(
- 'click',
- function() {
- timeSlotGroupInputs.prop('checked', false);
- updateTimeSlotGroupToggling();
- });
+ schedEditor.find('#timeslot-group-toggles-modal .timeslot-group-buttons .select-all')
+ .get(0)
+ .addEventListener(
+ 'click',
+ function() {
+ timeSlotGroupInputs.not(':disabled').prop('checked', true);
+ updateTimeSlotGroupToggling();
+ });
+ schedEditor.find('#timeslot-group-toggles-modal .timeslot-group-buttons .clear-all')
+ .get(0)
+ .addEventListener(
+ 'click',
+ function() {
+ timeSlotGroupInputs.not(':disabled').prop('checked', false);
+ updateTimeSlotGroupToggling();
+ });
updateTimeSlotGroupToggling();
updatePastTimeslots();
setInterval(updatePastTimeslots, 10 * 1000 /* ms */);
// session info
- content.find(".session-info-container").on("mouseover", ".other-session", function (event) {
- sessions.filter("#session" + this.dataset.othersessionid).addClass("highlight");
- }).on("mouseleave", ".other-session", function (event) {
- sessions.filter("#session" + this.dataset.othersessionid).removeClass("highlight");
- });
+ schedEditor.find(".session-info-container")
+ .on("mouseover", ".other-session", function () {
+ sessions.filter("#session" + this.dataset.othersessionid)
+ .addClass("highlight");
+ })
+ .on("mouseleave", ".other-session", function () {
+ sessions.filter("#session" + this.dataset.othersessionid).removeClass("highlight");
+ });
});
\ No newline at end of file
diff --git a/ietf/static/js/meeting-interim-request.js b/ietf/static/js/meeting-interim-request.js
index d63160680..e0290d3b6 100644
--- a/ietf/static/js/meeting-interim-request.js
+++ b/ietf/static/js/meeting-interim-request.js
@@ -35,6 +35,11 @@ var interimRequest = {
.each(interimRequest.updateInfo);
$('#id_country')
.select2({ placeholder: "Country" });
+ const remoteParticipations = $('select[id$="-remote_participation"]');
+ remoteParticipations.change(
+ evt => interimRequest.updateRemoteInstructionsVisibility(evt.target)
+ );
+ remoteParticipations.each((index, elt) => interimRequest.updateRemoteInstructionsVisibility(elt));
},
addSession: function () {
@@ -264,6 +269,22 @@ var interimRequest = {
$(".location")
.prop('disabled', true);
}
+ },
+
+ updateRemoteInstructionsVisibility : function(elt) {
+ const sessionSetPrefix = elt.id.replace('-remote_participation', '');
+ const remoteInstructionsId = sessionSetPrefix + '-remote_instructions';
+ const remoteInstructions = $('#' + remoteInstructionsId);
+
+ switch (elt.value) {
+ case 'meetecho':
+ remoteInstructions.closest('.form-group').hide();
+ break;
+
+ default:
+ remoteInstructions.closest('.form-group').show();
+ break;
+ }
}
}
diff --git a/ietf/static/js/session_details_form.js b/ietf/static/js/session_details_form.js
index 787f51407..84dbc5173 100644
--- a/ietf/static/js/session_details_form.js
+++ b/ietf/static/js/session_details_form.js
@@ -1,4 +1,4 @@
-/* Copyright The IETF Trust 2021, All Rights Reserved
+/* Copyright The IETF Trust 2021-2022, All Rights Reserved
*
* JS support for the SessionDetailsForm
* */
@@ -37,30 +37,27 @@
}
/* Update visibility of 'type' select so it is only shown when multiple options are available */
- function update_widget_visibility(elt, purpose, allowed_types) {
+ function update_type_field_visibility(elt, purpose, allowed_types) {
const valid_types = allowed_types[purpose] || [];
if (valid_types.length > 1) {
- elt.removeAttribute('hidden'); // make visible
+ elt.classList.remove('hidden'); // make visible
} else {
- elt.setAttribute('hidden', true); // make invisible
+ elt.classList.add('hidden'); // make invisible
}
}
/* Update the 'type' select to reflect a change in the selected purpose */
function update_type_element(type_elt, purpose, type_options, allowed_types) {
- update_widget_visibility(type_elt, purpose, allowed_types);
+ update_type_field_visibility(type_elt.closest('.form-group'), purpose, allowed_types);
update_type_option_visibility(type_options, purpose, allowed_types);
set_valid_type(type_elt, purpose, allowed_types);
}
- function update_name_field_visibility(name_elt, purpose) {
- const row = name_elt.closest('.mb-3');
- if (row) {
- if (purpose === 'regular') {
- row.setAttribute('hidden', true);
- } else {
- row.removeAttribute('hidden');
- }
+ function update_name_field_visibility(name_elts, purpose) {
+ if (!purpose || purpose === 'regular') {
+ name_elts.forEach(e => e.closest('.form-group').classList.add('hidden'));
+ } else {
+ name_elts.forEach(e => e.closest('.form-group').classList.remove('hidden'));
}
}
@@ -79,7 +76,10 @@
if (purpose_elt.type === 'hidden') {
return; // element is hidden, so nothing to do
}
- const name_elt = document.getElementById(id_prefix + 'name');
+ const name_elts = [
+ document.getElementById(id_prefix + 'name'),
+ document.getElementById(id_prefix + 'short'),
+ ].filter(Boolean); // removes null entries
const type_elt = document.getElementById(id_prefix + 'type');
const type_options = type_elt.getElementsByTagName('option');
const allowed_types = (type_elt.dataset.allowedOptions) ?
@@ -88,18 +88,18 @@
// update on future changes
purpose_elt.addEventListener(
'change',
- purpose_change_handler(name_elt, type_elt, type_options, allowed_types)
+ purpose_change_handler(name_elts, type_elt, type_options, allowed_types)
);
// update immediately
update_type_element(type_elt, purpose_elt.value, type_options, allowed_types);
- update_name_field_visibility(name_elt, purpose_elt.value);
+ update_name_field_visibility(name_elts, purpose_elt.value);
// hide the purpose selector if only one option
const purpose_options = purpose_elt.querySelectorAll('option:not([value=""])');
if (purpose_options.length < 2) {
- purpose_elt.closest('.mb-3')
- .setAttribute('hidden', true);
+ purpose_elt.closest('.form-group')
+ .classList.add('hidden');
}
}
diff --git a/ietf/static/js/week-view.js b/ietf/static/js/week-view.js
index 07cb68885..314a49cf6 100644
--- a/ietf/static/js/week-view.js
+++ b/ietf/static/js/week-view.js
@@ -180,6 +180,8 @@ window.draw_calendar = function (items, filter_params) {
e.style.textAlign = "center";
+ e.classList.add('agenda-weekview-day'); // for cypress tests
+
var div = document.createElement("div");
div.appendChild(document.createTextNode(day[((j + 1) % 7 + 7) % 7])); // js % is remainder, not modulus
j++;
@@ -211,6 +213,8 @@ window.draw_calendar = function (items, filter_params) {
e.style.margin = 0;
e.style.padding = padding;
+ e.classList.add('agenda-weekview-column'); // for cypress tests
+
document.body.appendChild(e);
}
@@ -257,6 +261,12 @@ window.draw_calendar = function (items, filter_params) {
e.style.fontSize = "8pt";
e.item = item;
+ // for cypress tests
+ e.classList.add('agenda-weekview-meeting');
+ if (day_width !== sess_width) {
+ e.classList.add('agenda-weekview-meeting-mini');
+ }
+
e.onmouseenter = function () {
resize(e, sess_top, day_left,
day_width - 2 * (padding + border),
diff --git a/ietf/stats/backfill_data.py b/ietf/stats/backfill_data.py
index c8ee39531..176ee3335 100755
--- a/ietf/stats/backfill_data.py
+++ b/ietf/stats/backfill_data.py
@@ -29,7 +29,7 @@ import debug # pyflakes:ignore
from ietf.doc.models import Document
from ietf.name.models import FormalLanguageName
-from ietf.utils.draft import Draft
+from ietf.utils.draft import PlaintextDraft
parser = argparse.ArgumentParser()
parser.add_argument("--document", help="specific document name")
@@ -89,7 +89,7 @@ for doc in docs_qs.prefetch_related("docalias", "formal_languages", "documentaut
with io.open(path, 'rb') as f:
say("\nProcessing %s" % doc.name)
sys.stdout.flush()
- d = Draft(unicode(f.read()), path)
+ d = PlaintextDraft(unicode(f.read()), path)
updated = False
diff --git a/ietf/stats/utils.py b/ietf/stats/utils.py
index 87b827ab5..75c7e56cc 100644
--- a/ietf/stats/utils.py
+++ b/ietf/stats/utils.py
@@ -15,6 +15,7 @@ from ietf.stats.models import AffiliationAlias, AffiliationIgnoredEnding, Countr
from ietf.name.models import CountryName
from ietf.person.models import Person, Email, Alias
from ietf.person.name import unidecode_name
+from ietf.utils.log import log
def compile_affiliation_ending_stripping_regexp():
@@ -230,7 +231,14 @@ def get_meeting_registration_data(meeting):
"""
num_created = 0
num_processed = 0
- response = requests.get(settings.STATS_REGISTRATION_ATTENDEES_JSON_URL.format(number=meeting.number))
+ try:
+ response = requests.get(
+ settings.STATS_REGISTRATION_ATTENDEES_JSON_URL.format(number=meeting.number),
+ timeout=settings.DEFAULT_REQUESTS_TIMEOUT,
+ )
+ except requests.Timeout as exc:
+ log(f'GET request timed out for [{settings.STATS_REGISTRATION_ATTENDEES_JSON_URL}]: {exc}')
+ raise RuntimeError("Timeout retrieving data from registrations API") from exc
if response.status_code == 200:
decoded = []
try:
diff --git a/ietf/submit/forms.py b/ietf/submit/forms.py
index 89030e82d..26f4fb2ec 100644
--- a/ietf/submit/forms.py
+++ b/ietf/submit/forms.py
@@ -38,7 +38,7 @@ from ietf.submit.parsers.pdf_parser import PDFParser
from ietf.submit.parsers.plain_parser import PlainParser
from ietf.submit.parsers.xml_parser import XMLParser
from ietf.utils import log
-from ietf.utils.draft import Draft
+from ietf.utils.draft import PlaintextDraft
from ietf.utils.text import normalize_text
class SubmissionBaseUploadForm(forms.Form):
@@ -302,7 +302,7 @@ class SubmissionBaseUploadForm(forms.Form):
try:
text = bytes.decode(self.file_info['txt'].charset)
#
- self.parsed_draft = Draft(text, txt_file.name)
+ self.parsed_draft = PlaintextDraft(text, txt_file.name)
if self.filename == None:
self.filename = self.parsed_draft.filename
elif self.filename != self.parsed_draft.filename:
diff --git a/ietf/submit/tests.py b/ietf/submit/tests.py
index c5edb41ea..c892c97b4 100644
--- a/ietf/submit/tests.py
+++ b/ietf/submit/tests.py
@@ -13,14 +13,19 @@ import mock
from io import StringIO
from pyquery import PyQuery
+from pathlib import Path
+
from django.conf import settings
+from django.test import override_settings
+from django.test.client import RequestFactory
from django.urls import reverse as urlreverse
from django.utils.encoding import force_str, force_text
import debug # pyflakes:ignore
-from ietf.submit.utils import expirable_submissions, expire_submission
-from ietf.doc.factories import DocumentFactory, WgDraftFactory, IndividualDraftFactory
+from ietf.submit.utils import (expirable_submissions, expire_submission, find_submission_filenames,
+ post_submission)
+from ietf.doc.factories import DocumentFactory, WgDraftFactory, IndividualDraftFactory, IndividualRfcFactory
from ietf.doc.models import ( Document, DocAlias, DocEvent, State,
BallotPositionDocEvent, DocumentAuthor, SubmissionDocEvent )
from ietf.doc.utils import create_ballot_if_not_open, can_edit_docextresources, update_action_holders
@@ -40,7 +45,7 @@ from ietf.utils.accesstoken import generate_access_token
from ietf.utils.mail import outbox, empty_outbox, get_payload_text
from ietf.utils.models import VersionInfo
from ietf.utils.test_utils import login_testing_unauthorized, TestCase
-from ietf.utils.draft import Draft
+from ietf.utils.draft import PlaintextDraft
class BaseSubmitTestCase(TestCase):
@@ -50,6 +55,7 @@ class BaseSubmitTestCase(TestCase):
'SUBMIT_YANG_DRAFT_MODEL_DIR',
'SUBMIT_YANG_IANA_MODEL_DIR',
'SUBMIT_YANG_CATALOG_DIR',
+ 'BIBXML_BASE_PATH',
]
def setUp(self):
@@ -59,6 +65,7 @@ class BaseSubmitTestCase(TestCase):
# old drafts may not be moved out of the way properly.
self.saved_repository_path = settings.IDSUBMIT_REPOSITORY_PATH
settings.IDSUBMIT_REPOSITORY_PATH = settings.INTERNET_DRAFT_PATH
+ os.mkdir(os.path.join(settings.BIBXML_BASE_PATH,'bibxml-ids'))
def tearDown(self):
settings.IDSUBMIT_REPOSITORY_PATH = self.saved_repository_path
@@ -251,6 +258,16 @@ class SubmitTests(BaseSubmitTestCase):
return confirmation_url
+ def verify_bibxml_ids_creation(self, draft):
+ # for name in (draft.name, draft.name[6:]):
+ # ref_file_name = os.path.join(os.path.join(settings.BIBXML_BASE_PATH, 'bibxml-ids'), 'reference.I-D.%s.xml' % (name, ))
+ # self.assertTrue(os.path.exists(ref_file_name))
+ # ref_rev_file_name = os.path.join(os.path.join(settings.BIBXML_BASE_PATH, 'bibxml-ids'), 'reference.I-D.%s-%s.xml' % (name, draft.rev ))
+ # self.assertTrue(os.path.exists(ref_rev_file_name))
+ ref_rev_file_name = os.path.join(os.path.join(settings.BIBXML_BASE_PATH, 'bibxml-ids'), 'reference.I-D.%s-%s.xml' % (draft.name, draft.rev ))
+ self.assertTrue(os.path.exists(ref_rev_file_name))
+
+
def submit_new_wg(self, formats):
# submit new -> supply submitter info -> approve
GroupFactory(type_id='wg',acronym='ames')
@@ -369,6 +386,8 @@ class SubmitTests(BaseSubmitTestCase):
self.assertContains(r, 'Yang Validation')
self.assertContains(r, 'WG Document')
+ self.verify_bibxml_ids_creation(draft)
+
def test_submit_new_wg_txt(self):
self.submit_new_wg(["txt"])
@@ -680,6 +699,7 @@ class SubmitTests(BaseSubmitTestCase):
self.assertContains(r, draft.title)
# Check submission settings
self.assertEqual(draft.submission().xml_version, "3" if 'xml' in formats else None)
+ self.verify_bibxml_ids_creation(draft)
def test_submit_existing_txt(self):
self.submit_existing(["txt"])
@@ -834,6 +854,7 @@ class SubmitTests(BaseSubmitTestCase):
new_revision = draft.latest_event()
self.assertEqual(new_revision.type, "new_revision")
self.assertEqual(new_revision.by.name, "Submitter Name")
+ self.verify_bibxml_ids_creation(draft)
def test_submit_new_individual_txt(self):
self.submit_new_individual(["txt"])
@@ -874,6 +895,7 @@ class SubmitTests(BaseSubmitTestCase):
self.assertEqual(docauth.person, author)
self.assertEqual(docauth.affiliation, '')
self.assertEqual(docauth.country, '')
+ self.verify_bibxml_ids_creation(doc)
def test_submit_new_draft_no_org_or_address_txt(self):
self.submit_new_draft_no_org_or_address(['txt'])
@@ -1010,6 +1032,7 @@ class SubmitTests(BaseSubmitTestCase):
# Check submission settings
self.assertEqual(draft.submission().xml_version, "3" if 'xml' in formats else None)
+ self.verify_bibxml_ids_creation(draft)
def test_submit_new_logged_in_txt(self):
self.submit_new_individual_logged_in(["txt"])
@@ -1053,6 +1076,7 @@ class SubmitTests(BaseSubmitTestCase):
[str(r) for r in resources],
)
self._assert_extresource_change_event(draft, is_present=True)
+ self.verify_bibxml_ids_creation(draft)
def test_submit_update_individual(self):
IndividualDraftFactory(name='draft-ietf-random-thing', states=[('draft','rfc')], other_aliases=['rfc9999',], pages=5)
@@ -1110,6 +1134,7 @@ class SubmitTests(BaseSubmitTestCase):
self.assertContains(r, draft.name)
self.assertContains(r, draft.title)
self._assert_extresource_change_event(draft, is_present=False)
+ self.verify_bibxml_ids_creation(draft)
def submit_existing_with_extresources(self, group_type, stream_type='ietf'):
"""Submit a draft with external resources
@@ -1385,6 +1410,7 @@ class SubmitTests(BaseSubmitTestCase):
draft = Document.objects.get(docalias__name=name)
self.assertEqual(draft.rev, rev)
self.assertEqual(draft.docextresource_set.count(), 0)
+ self.verify_bibxml_ids_creation(draft)
def test_search_for_submission_and_edit_as_secretariat(self):
# submit -> edit
@@ -2832,10 +2858,62 @@ class RefsTests(BaseSubmitTestCase):
group = None
file, __ = submission_file('draft-some-subject', '00', group, 'txt', "test_submission.txt", )
- draft = Draft(file.read(), file.name)
+ draft = PlaintextDraft(file.read(), file.name)
refs = draft.get_refs()
self.assertEqual(refs['rfc2119'], 'norm')
self.assertEqual(refs['rfc8174'], 'norm')
self.assertEqual(refs['rfc8126'], 'info')
self.assertEqual(refs['rfc8175'], 'info')
-
\ No newline at end of file
+
+
+class PostSubmissionTests(BaseSubmitTestCase):
+ @override_settings(RFC_FILE_TYPES=('txt', 'xml'), IDSUBMIT_FILE_TYPES=('pdf', 'md'))
+ def test_find_submission_filenames_rfc(self):
+ """Posting an RFC submission should use RFC_FILE_TYPES"""
+ rfc = IndividualRfcFactory()
+ path = Path(self.staging_dir)
+ for ext in ['txt', 'xml', 'pdf', 'md']:
+ (path / f'{rfc.name}-{rfc.rev}.{ext}').touch()
+ files = find_submission_filenames(rfc)
+ self.assertCountEqual(
+ files,
+ {
+ 'txt': f'{path}/{rfc.name}-{rfc.rev}.txt',
+ 'xml': f'{path}/{rfc.name}-{rfc.rev}.xml',
+ # should NOT find the pdf or md
+ }
+ )
+
+ @override_settings(RFC_FILE_TYPES=('txt', 'xml'), IDSUBMIT_FILE_TYPES=('pdf', 'md'))
+ def test_find_submission_filenames_draft(self):
+ """Posting an I-D submission should use IDSUBMIT_FILE_TYPES"""
+ draft = WgDraftFactory()
+ path = Path(self.staging_dir)
+ for ext in ['txt', 'xml', 'pdf', 'md']:
+ (path / f'{draft.name}-{draft.rev}.{ext}').touch()
+ files = find_submission_filenames(draft)
+ self.assertCountEqual(
+ files,
+ {
+ 'pdf': f'{path}/{draft.name}-{draft.rev}.pdf',
+ 'md': f'{path}/{draft.name}-{draft.rev}.md',
+ # should NOT find the txt or xml
+ }
+ )
+
+ @mock.patch('ietf.submit.utils.rebuild_reference_relations')
+ @mock.patch('ietf.submit.utils.find_submission_filenames')
+ def test_post_submission_rebuilds_ref_relations(self, mock_find_filenames, mock_rebuild_reference_relations):
+ """The post_submission method should rebuild reference relations from correct files
+
+ This tests that the post_submission() utility function gets the list of files to handle from the
+ find_submission_filenames() method and passes them along to rebuild_reference_relations().
+ """
+ submission = SubmissionFactory()
+ mock_find_filenames.return_value = {'xml': f'{self.staging_dir}/{submission.name}.xml'}
+ request = RequestFactory()
+ request.user = PersonFactory().user
+ post_submission(request, submission, 'doc_desc', 'subm_desc')
+ args, kwargs = mock_rebuild_reference_relations.call_args
+ self.assertEqual(args[1], mock_find_filenames.return_value)
+
diff --git a/ietf/submit/utils.py b/ietf/submit/utils.py
index b4a8de8df..495759dd6 100644
--- a/ietf/submit/utils.py
+++ b/ietf/submit/utils.py
@@ -17,6 +17,7 @@ from django.core.validators import validate_email
from django.db import transaction
from django.http import HttpRequest # pyflakes:ignore
from django.utils.module_loading import import_string
+from django.template.loader import render_to_string
import debug # pyflakes:ignore
@@ -39,7 +40,7 @@ from ietf.submit.models import ( Submission, SubmissionEvent, Preapproval, Draft
SubmissionCheck, SubmissionExtResource )
from ietf.utils import log
from ietf.utils.accesstoken import generate_random_key
-from ietf.utils.draft import Draft
+from ietf.utils.draft import PlaintextDraft
from ietf.utils.mail import is_valid_email
from ietf.utils.text import parse_unicode
from ietf.person.name import unidecode_name
@@ -261,6 +262,18 @@ def post_rev00_submission_events(draft, submission, submitter):
return events
+def find_submission_filenames(draft):
+ """Find uploaded files corresponding to the draft
+
+ Returns a dict mapping file extension to the corresponding filename (including the full path).
+ """
+ path = pathlib.Path(settings.IDSUBMIT_STAGING_PATH)
+ stem = f'{draft.name}-{draft.rev}'
+ allowed_types = settings.RFC_FILE_TYPES if draft.get_state_slug() == 'rfc' else settings.IDSUBMIT_FILE_TYPES
+ candidates = {ext: path / f'{stem}.{ext}' for ext in allowed_types}
+ return {ext: str(filename) for ext, filename in candidates.items() if filename.exists()}
+
+
@transaction.atomic
def post_submission(request, submission, approved_doc_desc, approved_subm_desc):
log.log(f"{submission.name}: start")
@@ -351,7 +364,7 @@ def post_submission(request, submission, approved_doc_desc, approved_subm_desc):
log.log(f"{submission.name}: updated state and info")
- trouble = rebuild_reference_relations(draft, filename=os.path.join(settings.IDSUBMIT_STAGING_PATH, '%s-%s.txt' % (submission.name, submission.rev)))
+ trouble = rebuild_reference_relations(draft, find_submission_filenames(draft))
if trouble:
log.log('Rebuild_reference_relations trouble: %s'%trouble)
log.log(f"{submission.name}: rebuilt reference relations")
@@ -449,6 +462,20 @@ def post_submission(request, submission, approved_doc_desc, approved_subm_desc):
submission.save()
create_submission_event(request, submission, approved_subm_desc)
+
+ # Create bibxml-ids entry
+ ref_text = '%s' % render_to_string('doc/bibxml.xml', {'name':draft.name, 'doc': draft, 'doc_bibtype':'I-D'})
+ # for name in (draft.name, draft.name[6:]):
+ # ref_file_name = os.path.join(os.path.join(settings.BIBXML_BASE_PATH, 'bibxml-ids'), 'reference.I-D.%s.xml' % (name, ))
+ # with io.open(ref_file_name, "w", encoding='utf-8') as f:
+ # f.write(ref_text)
+ # ref_rev_file_name = os.path.join(os.path.join(settings.BIBXML_BASE_PATH, 'bibxml-ids'), 'reference.I-D.%s-%s.xml' % (name, draft.rev ))
+ # with io.open(ref_rev_file_name, "w", encoding='utf-8') as f:
+ # f.write(ref_text)
+ ref_rev_file_name = os.path.join(os.path.join(settings.BIBXML_BASE_PATH, 'bibxml-ids'), 'reference.I-D.%s-%s.xml' % (draft.name, draft.rev ))
+ with io.open(ref_rev_file_name, "w", encoding='utf-8') as f:
+ f.write(ref_text)
+
log.log(f"{submission.name}: done")
@@ -708,8 +735,7 @@ def save_files(form):
def get_draft_meta(form, saved_files):
authors = []
file_name = saved_files
- abstract = None
- file_size = None
+
if form.cleaned_data['xml']:
# Some meta-information, such as the page-count, can only
# be retrieved from the generated text file. Provide a
@@ -717,7 +743,7 @@ def get_draft_meta(form, saved_files):
file_name['txt'] = os.path.join(settings.IDSUBMIT_STAGING_PATH, '%s-%s.txt' % (form.filename, form.revision))
file_size = os.stat(file_name['txt']).st_size
with io.open(file_name['txt']) as txt_file:
- form.parsed_draft = Draft(txt_file.read(), txt_file.name)
+ form.parsed_draft = PlaintextDraft(txt_file.read(), txt_file.name)
else:
file_size = form.cleaned_data['txt'].size
diff --git a/ietf/sync/iana.py b/ietf/sync/iana.py
index 93f958a99..b98699156 100644
--- a/ietf/sync/iana.py
+++ b/ietf/sync/iana.py
@@ -19,6 +19,7 @@ from ietf.doc.mails import email_state_changed
from ietf.doc.models import Document, DocEvent, State, StateDocEvent, StateType
from ietf.doc.utils import add_state_change_event
from ietf.person.models import Person
+from ietf.utils.log import log
from ietf.utils.mail import parseaddr, get_payload_text
from ietf.utils.timezone import local_timezone_to_utc, email_time_to_local_timezone, utc_to_local_timezone
@@ -69,8 +70,12 @@ def fetch_changes_json(url, start, end):
username = "ietfsync"
password = settings.IANA_SYNC_PASSWORD
headers = { "Authorization": "Basic %s" % force_str(base64.encodebytes(smart_bytes("%s:%s" % (username, password)))).replace("\n", "") }
- text = requests.get(url, headers=headers).text
- return text
+ try:
+ response = requests.get(url, headers=headers, timeout=settings.DEFAULT_REQUESTS_TIMEOUT)
+ except requests.Timeout as exc:
+ log(f'GET request failed for [{url}]: {exc}')
+ raise RuntimeError(f'Timeout retrieving [{url}]') from exc
+ return response.text
def parse_changes_json(text):
response = json.loads(text)
diff --git a/ietf/sync/rfceditor.py b/ietf/sync/rfceditor.py
index f41554c03..c2264a0d3 100644
--- a/ietf/sync/rfceditor.py
+++ b/ietf/sync/rfceditor.py
@@ -558,7 +558,12 @@ def post_approved_draft(url, name):
text = error = ""
try:
- r = requests.post(url, headers=headers, data=smart_bytes(urlencode({ 'draft': name })), timeout=20)
+ r = requests.post(
+ url,
+ headers=headers,
+ data=smart_bytes(urlencode({ 'draft': name })),
+ timeout=settings.DEFAULT_REQUESTS_TIMEOUT,
+ )
log("RFC-Editor notification result for draft '%s': %s:'%s'" % (name, r.status_code, r.text))
diff --git a/ietf/templates/base.html b/ietf/templates/base.html
index d03bc6006..8f8d69799 100644
--- a/ietf/templates/base.html
+++ b/ietf/templates/base.html
@@ -51,7 +51,7 @@
{% if not user.is_authenticated %}
+ href="/accounts/login/?next={{ request.get_full_path|removesuffix:"accounts/logout/"|urlencode }}">
Sign
in
diff --git a/ietf/templates/base/menu.html b/ietf/templates/base/menu.html
index a08b0820b..8e1603cee 100644
--- a/ietf/templates/base/menu.html
+++ b/ietf/templates/base/menu.html
@@ -1,7 +1,7 @@
{# Copyright The IETF Trust 2015-2019, All Rights Reserved #}
{% load origin %}
{% origin %}
-{% load ietf_filters managed_groups wg_menu active_groups_menu group_filters %}
+{% load ietf_filters managed_groups wg_menu active_groups_menu group_filters cache %}
{% if flavor != 'top' %}
{% include "base/menu_user.html" %}
{% endif %}
diff --git a/ietf/templates/doc/bofreq/new_bofreq.html b/ietf/templates/doc/bofreq/new_bofreq.html
index 63c22926a..c9b90ffe8 100644
--- a/ietf/templates/doc/bofreq/new_bofreq.html
+++ b/ietf/templates/doc/bofreq/new_bofreq.html
@@ -1,6 +1,6 @@
{% extends "base.html" %}
{# Copyright The IETF Trust 2021, All Rights Reserved #}
-{% load origin django_bootstrap5 static %}
+{% load origin django_bootstrap5 static textfilters %}
{% block title %}Start a new BOF Request{% endblock %}
{% block content %}
{% origin %}
@@ -9,7 +9,7 @@
Choose a short descriptive title for your request. Take time to choose a good initial title - it will be used to make the filename for your request's content. The title can be changed later, but the filename will not change.
- For example, a request with a title of "A new important bit" will be saved as bofreq-a-new-important-bit-00.md.
+ For example, a request with a title of "A new important bit" will be saved as bofreq-{{ user.person.last_name|xslugify|slice:"64" }}-a-new-important-bit-00.md.
+
+[](https://github.com/ietf-tools/datatracker/releases)
+[](https://github.com/ietf-tools/datatracker/blob/main/LICENSE)
+
+
+##### The day-to-day front-end to the IETF database for people who work on IETF standards.
+
+