Merge branch 'on-the-plane'release_2013-01-25

10 files changed, 76 insertions, 21 deletions

diff --git a/packages/admin.py b/packages/admin.py
index 5e32dbb4..820bbb29 100644
--- a/packages/admin.py
+++ b/packages/admin.py
@@ -3,6 +3,7 @@ from django.contrib import admin
 from .models import (PackageRelation, FlagRequest,
         Signoff, SignoffSpecification, Update)
 
+
 class PackageRelationAdmin(admin.ModelAdmin):
     list_display = ('pkgbase', 'user', 'type', 'created')
     list_filter = ('type', 'user')
@@ -19,6 +20,10 @@ class FlagRequestAdmin(admin.ModelAdmin):
     ordering = ('-created',)
     date_hierarchy = 'created'
 
+    def queryset(self, request):
+        qs = super(FlagRequestAdmin, self).queryset(request)
+        return qs.select_related('repo', 'user')
+
 
 class SignoffAdmin(admin.ModelAdmin):
     list_display = ('pkgbase', 'full_version', 'arch', 'repo',
@@ -28,6 +33,7 @@ class SignoffAdmin(admin.ModelAdmin):
     ordering = ('-created',)
     date_hierarchy = 'created'
 
+
 class SignoffSpecificationAdmin(admin.ModelAdmin):
     list_display = ('pkgbase', 'full_version', 'arch', 'repo',
             'user', 'created', 'comments')
@@ -36,6 +42,10 @@ class SignoffSpecificationAdmin(admin.ModelAdmin):
     ordering = ('-created',)
     date_hierarchy = 'created'
 
+    def queryset(self, request):
+        qs = super(SignoffSpecificationAdmin, self).queryset(request)
+        return qs.select_related('arch', 'repo', 'user')
+
 
 class UpdateAdmin(admin.ModelAdmin):
     list_display = ('pkgname', 'repo', 'arch', 'action_flag',
diff --git a/packages/models.py b/packages/models.py
index ef86d8e9..ff677883 100644
--- a/packages/models.py
+++ b/packages/models.py
@@ -318,7 +318,8 @@ class Update(models.Model):
         return u'%s-%s' % (self.new_pkgver, self.new_pkgrel)
 
     def elsewhere(self):
-        return Package.objects.filter(pkgname=self.pkgname, arch=self.arch)
+        return Package.objects.normal().filter(
+                pkgname=self.pkgname, arch=self.arch)
 
     def __unicode__(self):
         return u'%s of %s on %s' % (self.get_action_flag_display(),
diff --git a/packages/utils.py b/packages/utils.py
index a72404f4..49aeb8ce 100644
--- a/packages/utils.py
+++ b/packages/utils.py
@@ -6,6 +6,7 @@ import re
 from django.core.serializers.json import DjangoJSONEncoder
 from django.db import connection
 from django.db.models import Count, Max, F
+from django.db.models.query import QuerySet
 from django.contrib.auth.models import User
 
 from main.models import Package, PackageFile, Arch, Repo
@@ -253,8 +254,11 @@ def attach_maintainers(packages):
     '''Given a queryset or something resembling it of package objects, find all
     the maintainers and attach them to the packages to prevent N+1 query
     cascading.'''
-    packages = list(packages)
-    pkgbases = {p.pkgbase for p in packages if p is not None}
+    if isinstance(packages, QuerySet):
+        pkgbases = packages.values('pkgbase')
+    else:
+        packages = list(packages)
+        pkgbases = {p.pkgbase for p in packages if p is not None}
     rels = PackageRelation.objects.filter(type=PackageRelation.MAINTAINER,
             pkgbase__in=pkgbases).values_list(
             'pkgbase', 'user_id').order_by().distinct()
diff --git a/packages/views/display.py b/packages/views/display.py
index 445c1abe..497c8d48 100644
--- a/packages/views/display.py
+++ b/packages/views/display.py
@@ -1,6 +1,5 @@
 import datetime
 import json
-from string import Template
 from urllib import urlencode
 
 from django.http import HttpResponse, Http404
@@ -168,7 +167,7 @@ def group_details(request, arch, name):
 
 
 def files(request, name, repo, arch):
-    pkg = get_object_or_404(Package,
+    pkg = get_object_or_404(Package.objects.normal(),
             pkgname=name, repo__name__iexact=repo, arch__name=arch)
     # files are inserted in sorted order, so preserve that
     fileslist = PackageFile.objects.filter(pkg=pkg).order_by('id')
@@ -185,14 +184,14 @@ def files(request, name, repo, arch):
 
 
 def details_json(request, name, repo, arch):
-    pkg = get_object_or_404(Package,
+    pkg = get_object_or_404(Package.objects.normal(),
             pkgname=name, repo__name__iexact=repo, arch__name=arch)
     to_json = json.dumps(pkg, ensure_ascii=False, cls=PackageJSONEncoder)
     return HttpResponse(to_json, content_type='application/json')
 
 
 def files_json(request, name, repo, arch):
-    pkg = get_object_or_404(Package,
+    pkg = get_object_or_404(Package.objects.normal(),
             pkgname=name, repo__name__iexact=repo, arch__name=arch)
     # files are inserted in sorted order, so preserve that
     fileslist = PackageFile.objects.filter(pkg=pkg).order_by('id')
@@ -213,7 +212,7 @@ def files_json(request, name, repo, arch):
 
 
 def download(request, name, repo, arch):
-    pkg = get_object_or_404(Package,
+    pkg = get_object_or_404(Package.objects.normal(),
             pkgname=name, repo__name__iexact=repo, arch__name=arch)
     url = get_mirror_url_for_download()
     if not url:
@@ -223,12 +222,9 @@ def download(request, name, repo, arch):
         # grab the first non-any arch to fake the download path
         arch = Arch.objects.exclude(agnostic=True)[0].name
     values = {
-        'host': url.url,
-        'arch': arch,
-        'repo': pkg.repo.name.lower(),
-        'file': pkg.filename,
     }
-    url = Template('${host}${repo}/os/${arch}/${file}').substitute(values)
+    url = '{host}{repo}/os/{arch}/{filename}'.format(host=url.url,
+            repo=pkg.repo.name.lower(), arch=arch, filename=pkg.filename)
     return redirect(url)
 
 # vim: set ts=4 sw=4 et:
diff --git a/packages/views/flag.py b/packages/views/flag.py
index dadadd19..edb3f092 100644
--- a/packages/views/flag.py
+++ b/packages/views/flag.py
@@ -49,7 +49,7 @@ def flaghelp(request):
 
 @never_cache
 def flag(request, name, repo, arch):
-    pkg = get_object_or_404(Package,
+    pkg = get_object_or_404(Package.objects.normal(),
             pkgname=name, repo__name__iexact=repo, arch__name=arch)
     if pkg.flag_date is not None:
         # already flagged. do nothing.
@@ -158,7 +158,7 @@ def flag_confirmed(request, name, repo, arch):
 
 @permission_required('main.change_package')
 def unflag(request, name, repo, arch):
-    pkg = get_object_or_404(Package,
+    pkg = get_object_or_404(Package.objects.normal(),
             pkgname=name, repo__name__iexact=repo, arch__name=arch)
     pkg.flag_date = None
     pkg.save()
@@ -166,7 +166,7 @@ def unflag(request, name, repo, arch):
 
 @permission_required('main.change_package')
 def unflag_all(request, name, repo, arch):
-    pkg = get_object_or_404(Package,
+    pkg = get_object_or_404(Package.objects.normal(),
             pkgname=name, repo__name__iexact=repo, arch__name=arch)
     # find all packages from (hopefully) the same PKGBUILD
     pkgs = Package.objects.filter(pkgbase=pkg.pkgbase,
diff --git a/sitestatic/archweb.css b/sitestatic/archweb.css
index f43bba1f..dcc964ee 100644
--- a/sitestatic/archweb.css
+++ b/sitestatic/archweb.css
@@ -1079,6 +1079,14 @@ ul.signoff-list {
     color: red;
 }
 
+#release-list .available-yes {
+    color: green;
+}
+
+#release-list .available-no {
+    color: red;
+}
+
 #key-status .signed-yes {
     color: green;
 }
diff --git a/templates/releng/release_list.html b/templates/releng/release_list.html
index 1657249f..84008541 100644
--- a/templates/releng/release_list.html
+++ b/templates/releng/release_list.html
@@ -1,5 +1,6 @@
 {% extends "base.html" %}
 {% load url from future %}
+{% load static from staticfiles %}
 
 {% block title %}Arch Linux - Releases{% endblock %}
 
@@ -9,7 +10,6 @@
 
 {% block content %}
 <div id="release-list" class="box">
-
     <h2>Releases</h2>
 
     <table id="release-table" class="results">
@@ -28,9 +28,9 @@
             {% for item in release_list %}
             <tr class="{% cycle 'odd' 'even' %}">
                 <td>{{ item.release_date|date }}</td>
-				<td><a href="{{ item.get_absolute_url }}" title="Release details for {{ item.version }}">{{ item.version }}</a></td>
+                <td><a href="{{ item.get_absolute_url }}" title="Release details for {{ item.version }}">{{ item.version }}</a></td>
                 <td>{{ item.kernel_version|default:"" }}</td>
-                <td>{{ item.available|yesno }}</td>
+                <td class="available-{{ item.available|yesno }}">{{ item.available|yesno|capfirst }}</td>
                 <td>{% if item.available %}<a href="https://www.archlinux.org/{{ item.iso_url }}.torrent"
                         title="Download torrent for {{ item.version }}">Torrent</a>{% endif %}</td>
                 <td>{% if item.available %}<a href="{{ item.magnet_uri }}">Magnet</a>{% endif %}</td>
@@ -39,6 +39,17 @@
             {% endfor %}
         </tbody>
     </table>
-
 </div>
+
+{% load cdn %}{% jquery %}{% jquery_tablesorter %}
+<script type="text/javascript" src="{% static "archweb.js" %}"></script>
+<script type="text/javascript">
+$(document).ready(function() {
+    $(".results").tablesorter({
+        widgets: ['zebra'],
+        sortList: [[0,1], [1,1]],
+        headers: { 4: { sorter: false }, 5: { sorter: false } }
+    });
+});
+</script>
 {% endblock %}
diff --git a/templates/todolists/view.html b/templates/todolists/view.html
index 86221127..e544fa12 100644
--- a/templates/todolists/view.html
+++ b/templates/todolists/view.html
@@ -1,5 +1,6 @@
 {% extends "base.html" %}
 {% load static from staticfiles %}
+{% load package_extras %}
 {% load todolists %}
 
 {% block title %}Arch Linux - Todo: {{ list.name }}{% endblock %}
@@ -62,6 +63,7 @@
                 <th>Repository</th>
                 <th>Name</th>
                 <th>Current Version</th>
+                <th>Staging Version</th>
                 <th>Maintainers</th>
                 <th>Status</th>
             </tr>
@@ -77,6 +79,9 @@
                 {% else %}
                 <td>{{ pkg.pkg.full_version }}</td>
                 {% endif %}
+                {% with staging=pkg.staging %}
+                <td>{% pkg_details_link staging staging.full_version %}</td>
+                {% endwith %}
                 <td>{{ pkg.maintainers|join:', ' }}</td>
                 <td>
                     {% if perms.todolists.change_todolistpackage %}
diff --git a/todolists/utils.py b/todolists/utils.py
index e86d9054..51a75a3c 100644
--- a/todolists/utils.py
+++ b/todolists/utils.py
@@ -2,6 +2,7 @@ from django.db import connections, router
 from django.db.models import Count
 
 from .models import Todolist, TodolistPackage
+from packages.models import Package
 
 
 def todo_counts():
@@ -36,4 +37,22 @@ def get_annotated_todolists(incomplete_only=False):
 
     return lists
 
+
+def attach_staging(packages, list_id):
+    '''Look for any staging version of the packages provided and attach them
+    to the 'staging' attribute on each package if found.'''
+    pkgnames = TodolistPackage.objects.filter(
+            todolist_id=list_id).values('pkgname')
+    staging_pkgs = Package.objects.normal().filter(repo__staging=True,
+            pkgname__in=pkgnames)
+    # now build a lookup dict to attach to the correct package
+    lookup = {(p.pkgname, p.arch): p for p in staging_pkgs}
+
+    annotated = []
+    for package in packages:
+        in_staging = lookup.get((package.pkgname, package.arch), None)
+        package.staging = in_staging
+
+    return annotated
+
 # vim: set ts=4 sw=4 et:
diff --git a/todolists/views.py b/todolists/views.py
index fcf62e23..f333728a 100644
--- a/todolists/views.py
+++ b/todolists/views.py
@@ -16,7 +16,7 @@ from main.models import Package, Repo
 from main.utils import find_unique_slug
 from packages.utils import attach_maintainers
 from .models import Todolist, TodolistPackage
-from .utils import get_annotated_todolists
+from .utils import get_annotated_todolists, attach_staging
 
 
 class TodoListForm(forms.ModelForm):
@@ -69,6 +69,7 @@ def view(request, slug):
     # we don't hold onto the result, but the objects are the same here,
     # so accessing maintainers in the template is now cheap
     attach_maintainers(todolist.packages())
+    attach_staging(todolist.packages(), todolist.pk)
     arches = {tp.arch for tp in todolist.packages()}
     repos = {tp.repo for tp in todolist.packages()}
     return render(request, 'todolists/view.html', {