From 617469405ada349f812947d1377ffdd0347f8f76 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Emilio=20A=2E=20S=C3=A1nchez=20L=C3=B3pez?=
 <esanchez@yaco.es>
Date: Mon, 14 Feb 2011 19:11:44 +0000
Subject: [PATCH] Show link to files in staging area. Fixes #599  - Legacy-Id:
 2858

---
 ietf/settings.py                            |  1 +
 ietf/submit/templatetags/__init__.py        |  0
 ietf/submit/templatetags/submit_tags.py     | 17 +++++++++++++++++
 ietf/templates/submit/draft_edit.html       |  5 ++++-
 ietf/templates/submit/draft_status.html     |  5 ++++-
 ietf/templates/submit/submission_files.html |  7 +++++++
 6 files changed, 33 insertions(+), 2 deletions(-)
 create mode 100644 ietf/submit/templatetags/__init__.py
 create mode 100644 ietf/submit/templatetags/submit_tags.py
 create mode 100644 ietf/templates/submit/submission_files.html

diff --git a/ietf/settings.py b/ietf/settings.py
index 86e859869..2caf8d3f6 100644
--- a/ietf/settings.py
+++ b/ietf/settings.py
@@ -197,6 +197,7 @@ FIRST_CUTOFF_DAYS = 5
 SECOND_CUTOFF_DAYS = 3
 
 STAGING_PATH = '/a/www/www6s/staging/'
+STAGING_URL = 'http://www.ietf.org/staging/'
 IDNITS_PATH = '/a/www/ietf-datatracker/release/idnits'
 MAX_PLAIN_DRAFT_SIZE = 6291456  # Max size of the txt draft in bytes
 
diff --git a/ietf/submit/templatetags/__init__.py b/ietf/submit/templatetags/__init__.py
new file mode 100644
index 000000000..e69de29bb
diff --git a/ietf/submit/templatetags/submit_tags.py b/ietf/submit/templatetags/submit_tags.py
new file mode 100644
index 000000000..9cdeb18a2
--- /dev/null
+++ b/ietf/submit/templatetags/submit_tags.py
@@ -0,0 +1,17 @@
+import os
+
+from django import template
+from django.conf import settings
+
+register = template.Library()
+
+
+@register.inclusion_tag('submit/submission_files.html', takes_context=True)
+def show_submission_files(context, submission):
+    result = []
+    for ext in submission.file_type.split(','):
+        source = os.path.join(settings.STAGING_PATH, '%s-%s%s' % (submission.filename, submission.revision, ext))
+        if os.path.exists(source):
+            result.append({'name': '[%s version ]' % ext[1:].capitalize(),
+                           'url': '%s%s-%s%s' % (settings.STAGING_URL, submission.filename, submission.revision, ext)})
+    return {'files': result}
diff --git a/ietf/templates/submit/draft_edit.html b/ietf/templates/submit/draft_edit.html
index e99fcf09c..ae6d015db 100644
--- a/ietf/templates/submit/draft_edit.html
+++ b/ietf/templates/submit/draft_edit.html
@@ -1,4 +1,5 @@
 {% extends "submit/draft_status.html" %}
+{% load submit_tags %}
 {% block title %}Adjust Meta-Data{% endblock %}
 
 {% block morecss %}
@@ -87,7 +88,9 @@ table.ietf-table span.field-error { display: block; color: red; }
 </div>
 
 <table class="metadata-table">
-<tr><th>Document</th><td>{{ detail.filename }} <a class="twopages_trigger" href="#">[View first two pages]</a></td></tr>
+<tr><th>Document</th><td>{{ detail.filename }} <a class="twopages_trigger" href="#">[View first two pages]</a>
+{% show_submission_files detail %}
+</td></tr>
 <tr><th>Submission date</th><td>{{ detail.submission_date }}</td></tr>
 <tr><th>WG</th><td>{{ validation.wg|default:"Individual Submission" }}</td></tr>
 <tr><th>File size</th><td>{{ detail.filesize|filesizeformat }}</td></tr>
diff --git a/ietf/templates/submit/draft_status.html b/ietf/templates/submit/draft_status.html
index 942b581e4..5550585e5 100644
--- a/ietf/templates/submit/draft_status.html
+++ b/ietf/templates/submit/draft_status.html
@@ -1,4 +1,5 @@
 {% extends "submit/submit_base.html" %}
+{% load submit_tags %}
 {% block title %}Submission status{% endblock %}
 
 {% block morecss %}
@@ -130,7 +131,9 @@ returned to the submitter.
 {% endif %}
 
 <table class="metadata-table">
-<tr><th>Document</th><td>{{ detail.filename }} <a class="twopages_trigger" href="#">[View first two pages]</a></td></tr>
+<tr><th>Document</th><td>{{ detail.filename }} <a class="twopages_trigger" href="#">[View first two pages]</a>
+{% show_submission_files detail %}
+</td></tr>
 <tr{% if validation.warnings.revision %} class="warning"{% endif %}><th>Revision</th><td>{{ detail.revision }}<div class="warn_message">{{ validation.warnings.revision }}</div></td></tr>
 <tr><th>Submission date</th><td>{{ detail.submission_date }}</td></tr>
 <tr><th>Title</th><td>{{ detail.id_document_name }}</td></tr>
diff --git a/ietf/templates/submit/submission_files.html b/ietf/templates/submit/submission_files.html
new file mode 100644
index 000000000..287d366c3
--- /dev/null
+++ b/ietf/templates/submit/submission_files.html
@@ -0,0 +1,7 @@
+{% if files %}
+<ul>
+{% for file in files %}
+  <li><a href="{{ file.url }}" target="_blank">{{ file.name }}</a></li>
+{% endfor %}
+</ul>
+{% endif %}