Merge tag 'release_2012-02-23'

Fix template fragment caching issue

4 files changed, 10 insertions, 13 deletions

diff --git a/templates/packages/details.html b/templates/packages/details.html
index fb379df4..715ba2c0 100644
--- a/templates/packages/details.html
+++ b/templates/packages/details.html
@@ -1,5 +1,4 @@
 {% extends "base.html" %}
-{% load cache %}
 {% load package_extras %}
 
 {% block title %}Parabola - {{ pkg.pkgname }} {{ pkg.full_version }} - Package Details{% endblock %}
@@ -12,7 +11,6 @@
     <h2>Package Details: {{ pkg.pkgname }} {{ pkg.full_version }}</h2>
 
     <div id="detailslinks" class="listing">
-
         <div id="actionlist">
         <h4>Package Actions</h4>
             <ul class="small">
@@ -65,10 +63,8 @@
             </ul>
         </div>
         {% endif %}{% endwith %}
-
     </div>
 
-    {% cache 300 package-details-pkginfo pkg.id %}
     <table id="pkginfo">
         <tr>
             <th>Architecture:</th>
@@ -180,13 +176,7 @@
             <h3 title="Packages that require {{ pkg.pkgname }}">
                 Required By ({{rqdby|length}})</h3>
             {% if rqdby %}<ul>
-                {% for req in rqdby %}
-                <li>{% pkg_details_link req.pkg %}
-                {% if req.depname != pkg.pkgname %}<span class="virtual-dep">(requires {{ req.depname }})</span>{% endif %}
-                {% if req.pkg.repo.testing %}<span class="testing-dep">(testing)</span>{% endif %}
-                {% if req.optional %}<span class="opt-dep">(optional)</span>{% endif %}
-                </li>
-                {% endfor %}
+                {% for req in rqdby %}{% include "packages/details_requiredby.html" %}{% endfor %}
             </ul>{% endif %}
         </div>
         {% endwith %}
@@ -202,7 +192,6 @@
         </div>
 
     </div>
-    {% endcache %}
 
 </div>
 
diff --git a/templates/packages/details_depend.html b/templates/packages/details_depend.html
index 0226dd25..8b6e85c9 100644
--- a/templates/packages/details_depend.html
+++ b/templates/packages/details_depend.html
@@ -9,6 +9,7 @@
 {% else %}
 {% pkg_details_link depend.pkg %}{{ depend.dep.depvcmp|default:"" }}
 {% if depend.pkg.repo.testing %} <span class="testing-dep">(testing)</span>{% endif %}
+{% if depend.pkg.repo.staging %} <span class="staging-dep">(staging)</span>{% endif %}
 {% endifequal %}
 {% if depend.dep.optional %} <span class="opt-dep">(optional)</span>{% endif %}
 {% if depend.dep.description %}- <span class="dep-desc">{{ depend.dep.description }}</span>{% endif %}
diff --git a/templates/packages/details_requiredby.html b/templates/packages/details_requiredby.html
new file mode 100644
index 00000000..c7697289
--- /dev/null
+++ b/templates/packages/details_requiredby.html
@@ -0,0 +1,7 @@
+{% load package_extras %}
+<li>{% pkg_details_link req.pkg %}
+{% if req.depname != pkg.pkgname %}<span class="virtual-dep">(requires {{ req.depname }})</span>{% endif %}
+{% if req.pkg.repo.testing %}<span class="testing-dep">(testing)</span>{% endif %}
+{% if req.pkg.repo.staging %}<span class="staging-dep">(staging)</span>{% endif %}
+{% if req.optional %}<span class="opt-dep">(optional)</span>{% endif %}
+</li>
diff --git a/templates/todolists/view.html b/templates/todolists/view.html
index fb06ebdd..9c87f38b 100644
--- a/templates/todolists/view.html
+++ b/templates/todolists/view.html
@@ -78,7 +78,7 @@ $(document).ready(function() {
     $(".results").tablesorter({
         widgets: ['zebra'],
         sortList: [[2,0], [0,0]],
-        headers: { 4: { sorter: 'todostatus' } }
+        headers: { 5: { sorter: 'todostatus' } }
     });
 });
 </script>