ci: merge main to release

larseggert · Jul 13, 2023 · 3ea79c2 · 3ea79c2
2 parents 6b1e581 + f12e137
commit 3ea79c2
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 3 deletions.
diff --git a/ietf/doc/tests_utils.py b/ietf/doc/tests_utils.py
@@ -308,7 +308,7 @@ def test_build_file_urls(self, mocked):
             build_file_urls(WgDraftFactory(rev=''))
 
         urls, types = build_file_urls(WgDraftFactory(rev='23'))
-        self.assertEqual(['xml', 'bibtex'], [t for t, _ in urls])
+        self.assertEqual(['xml', 'bibtex', 'bibxml'], [t for t, _ in urls])
         self.assertEqual(types, ['xml'])
 
         urls, types = build_file_urls(WgRfcFactory(rev=''))

diff --git a/ietf/doc/utils.py b/ietf/doc/utils.py
@@ -1038,6 +1038,7 @@ def build_file_urls(doc: Union[Document, DocHistory]):
             file_urls.append(("htmlized", urlreverse('ietf.doc.views_doc.document_html', kwargs=dict(name=doc.name, rev=doc.rev))))
             file_urls.append(("pdfized", urlreverse('ietf.doc.views_doc.document_pdfized', kwargs=dict(name=doc.name, rev=doc.rev))))
         file_urls.append(("bibtex", urlreverse('ietf.doc.views_doc.document_bibtex',kwargs=dict(name=doc.name,rev=doc.rev))))
+        file_urls.append(("bibxml", urlreverse('ietf.doc.views_doc.document_bibxml',kwargs=dict(name=doc.name,rev=doc.rev))))
     else:
         # As of 2022-12-14, there are 1463 Document and 3136 DocHistory records with type='draft' and rev=''.
         # All of these are in the rfc state and are covered by the above cases.

diff --git a/ietf/name/fixtures/names.json b/ietf/name/fixtures/names.json
@@ -2967,7 +2967,7 @@
       "parent_types": [],
       "req_subm_approval": false,
       "role_order": "[\n    \"chair\",\n    \"member\"\n]",
-      "session_purposes": "[\n    \"officehourse\",\n    \"regular\"\n]",
+      "session_purposes": "[\n    \"officehours\",\n    \"regular\"\n]",
       "show_on_agenda": true
     },
     "model": "group.groupfeatures",

diff --git a/ietf/submit/forms.py b/ietf/submit/forms.py
@@ -646,6 +646,7 @@ def __init__(self, request, *args, **kwargs):
     def clean_txt(self):
         txt_file = self._clean_file("txt", PlainParser)
         if txt_file is not None:
+            txt_file.seek(0)
             bytes = txt_file.read()
             try:
                 text = bytes.decode(self.file_info["txt"].charset)

diff --git a/ietf/templates/doc/document_format_buttons.html b/ietf/templates/doc/document_format_buttons.html
@@ -15,7 +15,7 @@
           href="{{ url }}">
             {% if label == 'pdf' or label == 'pdfized' %}
                 <i class="bi bi-file-pdf"></i> pdf
-            {% elif label == 'xml' or label == 'html' %}
+            {% elif label == 'xml' or label == 'html' or label == 'bibxml' %}
                 <i class="bi bi-file-code"></i> {{ label}}
             {% elif label == 'htmlized' %}
                 <i class="bi bi-file-code"></i> htmlized