altf4arnold/datatracker
1
0
Fork 0
Code Issues Pull requests Actions 3 Packages Projects Releases Wiki Activity

Partially addresses issue #1926 still displaying markdown as text. Fixes #2704. Commit ready for merge.

Browse source 
- Legacy-Id: 16557
This commit is contained in:
Tom Pusateri 2019-07-20 18:58:34 +00:00
parent c3ffd09c6b
commit f76c46bef0
4 changed files with 14 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
ietf/doc/views_doc.py
View file

@ -586,6 +586,9 @@ def document_main(request, name, rev=None):
if extension == ".txt":
content = doc.text_or_error() # pyflakes:ignore
t = "plain text"
elif extension == ".md":
content = doc.text_or_error() # pyflakes:ignore
t = "markdown"
other_types.append((t, url))
return render(request, "doc/document_material.html",

2
ietf/meeting/forms.py
View file

@ -342,7 +342,7 @@ class FileUploadForm(forms.Form):
self.file_encoding = {}
self.file_encoding[file.name] = encoding.replace('charset=','') if encoding else None
if self.mime_types:
if mime_type != file.content_type:
if mime_type != file.content_type and not file.content_type in settings.MEETING_VALID_MAGIC_MIME_TYPES[mime_type]:
raise ValidationError('Upload Content-Type (%s) is different from the observed mime-type (%s)' % (file.content_type, mime_type))
if mime_type in settings.MEETING_VALID_MIME_TYPE_EXTENSIONS:
if not ext in settings.MEETING_VALID_MIME_TYPE_EXTENSIONS[mime_type]:

10
ietf/settings.py
View file

@ -814,18 +814,24 @@ MEETING_VALID_UPLOAD_EXTENSIONS = {
}
MEETING_VALID_UPLOAD_MIME_TYPES = {
'agenda': ['text/plain', 'text/html', ],
'minutes': ['text/plain', 'text/html', 'application/pdf', ],
'agenda': ['text/plain', 'text/html', 'text/markdown', ],
'minutes': ['text/plain', 'text/html', 'application/pdf', 'text/markdown', ],
'slides': [],
'bluesheets': ['application/pdf', 'text/plain', ],
}
MEETING_VALID_MIME_TYPE_EXTENSIONS = {
'text/plain': ['.txt', '.md', ],
'text/markdown': ['.txt', '.md', ],
'text/html': ['.html', '.htm'],
'application/pdf': ['.pdf'],
}
MEETING_VALID_MAGIC_MIME_TYPES = {
'text/plain': ['text/plain', 'text/markdown', ],
'text/html': ['text/html', ],
'application/pdf': ['application/pdf', ],
}
INTERNET_DRAFT_DAYS_TO_EXPIRE = 185

4
ietf/templates/meeting/session_agenda_include.html
View file

@ -16,7 +16,7 @@
<div class="modal-body">
{% with item.session.agenda as agenda %}
{% if agenda %}
{% if agenda.file_extension == "txt" or agenda.file_extension == "html" or agenda.file_extension == "htm" %}
{% if agenda.file_extension == "txt" or agenda.file_extension == "md" or agenda.file_extension == "html" or agenda.file_extension == "htm" %}
<h4>Agenda</h4>
<div class="frame" data-src="{{agenda.href}}"></div>
{% else %}
@ -41,7 +41,7 @@
{% with item.session.minutes as minutes %}
{% if minutes %}
{% if minutes.file_extension == "txt" or minutes.file_extension == "html" or minutes.file_extension == "htm" %}
{% if minutes.file_extension == "txt" or minutes.file_extension == "md" or minutes.file_extension == "html" or minutes.file_extension == "htm" %}
<h4>Minutes</h4>
<div class="frame2" data-src="{{minutes.href}}"></div>
{% else %}