From 67a0c0ac088ed2d48fc785f13097557ed6ad25cf Mon Sep 17 00:00:00 2001
From: Dan McGee <dan@archlinux.org>
Date: Thu, 9 Jan 2014 08:40:34 -0600
Subject: Remove remaining references to release file_size field

Signed-off-by: Dan McGee <dan@archlinux.org>
---
 templates/releng/release_list.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'templates/releng')

diff --git a/templates/releng/release_list.html b/templates/releng/release_list.html
index f7e90377..be257f9e 100644
--- a/templates/releng/release_list.html
+++ b/templates/releng/release_list.html
@@ -34,7 +34,7 @@
                 <td>{% if item.available %}<a href="{% url 'releng-release-torrent' item.version %}"
                         title="Download torrent for {{ item.version }}">Torrent</a>{% endif %}</td>
                 <td>{% if item.available %}<a href="{{ item.magnet_uri }}">Magnet</a>{% endif %}</td>
-                <td>{% if item.file_size %}{{ item.file_size|filesizeformat }}{% endif %}</td>
+                <td>{% if item.torrent_data %}{{ item.torrent.file_length|filesizeformat }}{% endif %}</td>
             </tr>
             {% endfor %}
         </tbody>
-- 
cgit v1.2.2


From b47b4e73b856b34afa07b1d72367dba4a7c6c005 Mon Sep 17 00:00:00 2001
From: Dan McGee <dan@archlinux.org>
Date: Tue, 7 Jan 2014 14:16:00 -0600
Subject: Remove release fields we can pull from the torrent

This makes entering new releases a bit less cumbersome as we don't
really need to enter either the file size or the torrent infohash.

Signed-off-by: Dan McGee <dan@archlinux.org>
---
 templates/releng/release_detail.html | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

(limited to 'templates/releng')

diff --git a/templates/releng/release_detail.html b/templates/releng/release_detail.html
index 09507536..5cd1c432 100644
--- a/templates/releng/release_detail.html
+++ b/templates/releng/release_detail.html
@@ -10,14 +10,12 @@
         <li><strong>Release Date:</strong> {{ release.release_date|date }}</li>
         {% if release.kernel_version %}<li><strong>Kernel Version:</strong> {{ release.kernel_version }}</li>{% endif %}
         <li><strong>Available:</strong> {{ release.available|yesno }}</li>
-        {% if release.available %}<li><strong>Download:</strong> <a
+        {% if release.torrent_data %}<li><strong>Download:</strong> <a
                 href="{% url 'releng-release-torrent' release.version %}"
                 title="Download torrent for {{ release.version }}">Torrent</a>,
             <a href="{{ release.magnet_uri }}">Magnet</a></li>{% endif %}
-        {% if release.torrent_infohash %}<li><strong>Torrent Info Hash:</strong> {{ release.torrent_infohash }}</li>{% endif %}
         {% if release.md5_sum %}<li><strong>MD5:</strong> {{ release.md5_sum }}</li>{% endif %}
         {% if release.sha1_sum %}<li><strong>SHA1:</strong> {{ release.sha1_sum }}</li>{% endif %}
-        <li><strong>Download Size:</strong> {% if release.file_size %}{{ release.file_size|filesizeformat }}{% else %}Unknown{% endif %}</li>
     </ul>
 
     {% if release.info %}
@@ -38,7 +36,7 @@
         <li><strong>File Length:</strong> {{ torrent.file_length|filesizeformat }}</li>
         <li><strong>Piece Count:</strong> {{ torrent.piece_count }} pieces</li>
         <li><strong>Piece Length:</strong> {{ torrent.piece_length|filesizeformat }}</li>
-        <li><strong>Computed Info Hash:</strong> {{ torrent.info_hash }}</li>
+        <li><strong>Info Hash:</strong> {{ torrent.info_hash }}</li>
         <li><strong>URL List Length:</strong> {{ torrent.url_list|length }} URLs</li>
     </ul>
     {% endwith %}{% endif %}
-- 
cgit v1.2.2