Skip to content

Commit 6174694

Browse files
committed
Show link to files in staging area. Fixes ietf-tools#599
- Legacy-Id: 2858
1 parent cd03c21 commit 6174694

6 files changed

Lines changed: 33 additions & 2 deletions

File tree

ietf/settings.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -197,6 +197,7 @@
197197
SECOND_CUTOFF_DAYS = 3
198198

199199
STAGING_PATH = '/a/www/www6s/staging/'
200+
STAGING_URL = 'http://www.ietf.org/staging/'
200201
IDNITS_PATH = '/a/www/ietf-datatracker/release/idnits'
201202
MAX_PLAIN_DRAFT_SIZE = 6291456 # Max size of the txt draft in bytes
202203

ietf/submit/templatetags/__init__.py

Whitespace-only changes.
Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
import os
2+
3+
from django import template
4+
from django.conf import settings
5+
6+
register = template.Library()
7+
8+
9+
@register.inclusion_tag('submit/submission_files.html', takes_context=True)
10+
def show_submission_files(context, submission):
11+
result = []
12+
for ext in submission.file_type.split(','):
13+
source = os.path.join(settings.STAGING_PATH, '%s-%s%s' % (submission.filename, submission.revision, ext))
14+
if os.path.exists(source):
15+
result.append({'name': '[%s version ]' % ext[1:].capitalize(),
16+
'url': '%s%s-%s%s' % (settings.STAGING_URL, submission.filename, submission.revision, ext)})
17+
return {'files': result}

ietf/templates/submit/draft_edit.html

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
{% extends "submit/draft_status.html" %}
2+
{% load submit_tags %}
23
{% block title %}Adjust Meta-Data{% endblock %}
34

45
{% block morecss %}
@@ -87,7 +88,9 @@ <h2>Adjust External Meta-Data</h2>
8788
</div>
8889

8990
<table class="metadata-table">
90-
<tr><th>Document</th><td>{{ detail.filename }} <a class="twopages_trigger" href="#">[View first two pages]</a></td></tr>
91+
<tr><th>Document</th><td>{{ detail.filename }} <a class="twopages_trigger" href="#">[View first two pages]</a>
92+
{% show_submission_files detail %}
93+
</td></tr>
9194
<tr><th>Submission date</th><td>{{ detail.submission_date }}</td></tr>
9295
<tr><th>WG</th><td>{{ validation.wg|default:"Individual Submission" }}</td></tr>
9396
<tr><th>File size</th><td>{{ detail.filesize|filesizeformat }}</td></tr>

ietf/templates/submit/draft_status.html

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
{% extends "submit/submit_base.html" %}
2+
{% load submit_tags %}
23
{% block title %}Submission status{% endblock %}
34

45
{% block morecss %}
@@ -130,7 +131,9 @@ <h3>Meta-Data errors found</h3>
130131
{% endif %}
131132

132133
<table class="metadata-table">
133-
<tr><th>Document</th><td>{{ detail.filename }} <a class="twopages_trigger" href="#">[View first two pages]</a></td></tr>
134+
<tr><th>Document</th><td>{{ detail.filename }} <a class="twopages_trigger" href="#">[View first two pages]</a>
135+
{% show_submission_files detail %}
136+
</td></tr>
134137
<tr{% if validation.warnings.revision %} class="warning"{% endif %}><th>Revision</th><td>{{ detail.revision }}<div class="warn_message">{{ validation.warnings.revision }}</div></td></tr>
135138
<tr><th>Submission date</th><td>{{ detail.submission_date }}</td></tr>
136139
<tr><th>Title</th><td>{{ detail.id_document_name }}</td></tr>
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{% if files %}
2+
<ul>
3+
{% for file in files %}
4+
<li><a href="{{ file.url }}" target="_blank">{{ file.name }}</a></li>
5+
{% endfor %}
6+
</ul>
7+
{% endif %}

0 commit comments

Comments
 (0)