From eb6aaf6759ac6626c06612dbde9b160927501f3b Mon Sep 17 00:00:00 2001
From: Dan McGee <dan@archlinux.org>
Date: Wed, 23 Mar 2011 12:32:10 -0500
Subject: Add flag date column to group details page

Signed-off-by: Dan McGee <dan@archlinux.org>
---
 templates/packages/group_details.html | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'templates/packages')

diff --git a/templates/packages/group_details.html b/templates/packages/group_details.html
index b40c21d0..22b805d4 100644
--- a/templates/packages/group_details.html
+++ b/templates/packages/group_details.html
@@ -14,6 +14,7 @@ <h2>Details for group {{ groupname }} - {{ arch.name }}</h2>
                 <th>Version</th>
                 <th>Description</th>
                 <th>Last Updated</th>
+                <th>Flag Date</th>
             </tr>
         </thead>
         <tbody>
@@ -30,6 +31,7 @@ <h2>Details for group {{ groupname }} - {{ arch.name }}</h2>
                 {% endif %}
                 <td class="wrap">{{ pkg.pkgdesc }}</td>
                 <td>{{ pkg.last_update|date }}</td>
+                <td>{{ pkg.flag_date|date }}</td>
             </tr>
             {% endfor %}
         </tbody>
-- 
cgit v1.2.3-54-g00ecf


From f46e5b1a94c845ea2125b4f9d6777dff56c9ad29 Mon Sep 17 00:00:00 2001
From: Dan McGee <dan@archlinux.org>
Date: Wed, 23 Mar 2011 12:44:12 -0500
Subject: Generalize group details page

We will be able to use this same table-based package listing elsewhere.

Signed-off-by: Dan McGee <dan@archlinux.org>
---
 packages/views.py                     |  5 ++--
 templates/packages/group_details.html | 47 -----------------------------------
 templates/packages/packages_list.html | 47 +++++++++++++++++++++++++++++++++++
 3 files changed, 50 insertions(+), 49 deletions(-)
 delete mode 100644 templates/packages/group_details.html
 create mode 100644 templates/packages/packages_list.html

(limited to 'templates/packages')

diff --git a/packages/views.py b/packages/views.py
index d393e694..374a1a20 100644
--- a/packages/views.py
+++ b/packages/views.py
@@ -111,11 +111,12 @@ def group_details(request, arch, name):
     if len(pkgs) == 0:
         raise Http404
     context = {
-        'groupname': name,
+        'list_title': 'Group Details',
+        'name': name,
         'arch': arch,
         'packages': pkgs,
     }
-    return direct_to_template(request, 'packages/group_details.html', context)
+    return direct_to_template(request, 'packages/packages_list.html', context)
 
 def getmaintainer(request, name, repo, arch):
     "Returns the maintainers as plaintext."
diff --git a/templates/packages/group_details.html b/templates/packages/group_details.html
deleted file mode 100644
index 22b805d4..00000000
--- a/templates/packages/group_details.html
+++ /dev/null
@@ -1,47 +0,0 @@
-{% extends "base.html" %}
-{% block title %}Arch Linux - {{ groupname }} - {{ arch.name }} - Group Details{% endblock %}
-{% block navbarclass %}anb-packages{% endblock %}
-
-{% block content %}
-<div class="box">
-    <h2>Details for group {{ groupname }} - {{ arch.name }}</h2>
-    <table class="results">
-        <thead>
-            <tr>
-                <th>Arch</th>
-                <th>Repo</th>
-                <th>Name</th>
-                <th>Version</th>
-                <th>Description</th>
-                <th>Last Updated</th>
-                <th>Flag Date</th>
-            </tr>
-        </thead>
-        <tbody>
-            {% for pkg in packages %}
-            <tr class="{% cycle 'odd' 'even' %}">
-                <td>{{ pkg.arch.name }}</td>
-                <td>{{ pkg.repo.name|capfirst }}</td>
-                <td><a href="{{ pkg.get_absolute_url }}"
-                        title="Package details for {{ pkg.pkgname }}">{{ pkg.pkgname }}</a></td>
-                {% if pkg.flag_date %}
-                <td><span class="flagged">{{ pkg.full_version }}</span></td>
-                {% else %}
-                <td>{{ pkg.full_version }}</td>
-                {% endif %}
-                <td class="wrap">{{ pkg.pkgdesc }}</td>
-                <td>{{ pkg.last_update|date }}</td>
-                <td>{{ pkg.flag_date|date }}</td>
-            </tr>
-            {% endfor %}
-        </tbody>
-    </table>
-</div>
-{% load cdn %}{% jquery %}
-<script type="text/javascript" src="/media/jquery.tablesorter.min.js"></script>
-<script type="text/javascript">
-$(document).ready(function() {
-    $(".results").tablesorter({widgets: ['zebra'], sortList: [[2,0]]});
-});
-</script>
-{% endblock %}
diff --git a/templates/packages/packages_list.html b/templates/packages/packages_list.html
new file mode 100644
index 00000000..c897aac5
--- /dev/null
+++ b/templates/packages/packages_list.html
@@ -0,0 +1,47 @@
+{% extends "base.html" %}
+{% block title %}Arch Linux - {{ name }} ({{ arch.name }}) - {{ list_title }}{% endblock %}
+{% block navbarclass %}anb-packages{% endblock %}
+
+{% block content %}
+<div class="box">
+    <h2>{{ list_title }} - {{ name }} ({{ arch.name }})</h2>
+    <table class="results">
+        <thead>
+            <tr>
+                <th>Arch</th>
+                <th>Repo</th>
+                <th>Name</th>
+                <th>Version</th>
+                <th>Description</th>
+                <th>Last Updated</th>
+                <th>Flag Date</th>
+            </tr>
+        </thead>
+        <tbody>
+            {% for pkg in packages %}
+            <tr class="{% cycle 'odd' 'even' %}">
+                <td>{{ pkg.arch.name }}</td>
+                <td>{{ pkg.repo.name|capfirst }}</td>
+                <td><a href="{{ pkg.get_absolute_url }}"
+                        title="Package details for {{ pkg.pkgname }}">{{ pkg.pkgname }}</a></td>
+                {% if pkg.flag_date %}
+                <td><span class="flagged">{{ pkg.full_version }}</span></td>
+                {% else %}
+                <td>{{ pkg.full_version }}</td>
+                {% endif %}
+                <td class="wrap">{{ pkg.pkgdesc }}</td>
+                <td>{{ pkg.last_update|date }}</td>
+                <td>{{ pkg.flag_date|date }}</td>
+            </tr>
+            {% endfor %}
+        </tbody>
+    </table>
+</div>
+{% load cdn %}{% jquery %}
+<script type="text/javascript" src="/media/jquery.tablesorter.min.js"></script>
+<script type="text/javascript">
+$(document).ready(function() {
+    $(".results").tablesorter({widgets: ['zebra'], sortList: [[2,0]]});
+});
+</script>
+{% endblock %}
-- 
cgit v1.2.3-54-g00ecf


From a52ddb5c48dd2cb7856779f64611679aca7d660d Mon Sep 17 00:00:00 2001
From: Dan McGee <dan@archlinux.org>
Date: Wed, 23 Mar 2011 12:47:26 -0500
Subject: Allow virtual base packages to display in web interface

Repurpose the old group details page to show a listing of all packages
built from a particular pkgbase value, even if this value is not an
actual package.

Signed-off-by: Dan McGee <dan@archlinux.org>
---
 packages/views.py               | 26 +++++++++++++++++++++++---
 templates/packages/details.html |  3 ++-
 2 files changed, 25 insertions(+), 4 deletions(-)

(limited to 'templates/packages')

diff --git a/packages/views.py b/packages/views.py
index 374a1a20..263165fd 100644
--- a/packages/views.py
+++ b/packages/views.py
@@ -83,9 +83,29 @@ def update(request):
 
 def details(request, name='', repo='', arch=''):
     if all([name, repo, arch]):
-        pkg = get_object_or_404(Package,
-                pkgname=name, repo__name__iexact=repo, arch__name=arch)
-        return direct_to_template(request, 'packages/details.html', {'pkg': pkg, })
+        try:
+            pkg = Package.objects.get(pkgname=name,
+                    repo__name__iexact=repo, arch__name=arch)
+            return direct_to_template(request, 'packages/details.html',
+                    {'pkg': pkg, })
+        except Package.DoesNotExist:
+            arch = get_object_or_404(Arch, name=arch)
+            arches = [ arch ]
+            arches.extend(Arch.objects.filter(agnostic=True))
+            repo = get_object_or_404(Repo, name__iexact=repo)
+            pkgs = Package.objects.filter(pkgbase=name,
+                    repo__testing=repo.testing, arch__in=arches)
+            pkgs = pkgs.select_related('arch', 'repo').order_by('pkgname')
+            if len(pkgs) == 0:
+                raise Http404
+            context = {
+                'list_title': 'Split Package Details',
+                'name': name,
+                'arch': arch,
+                'packages': pkgs,
+            }
+            return direct_to_template(request, 'packages/packages_list.html',
+                    context)
     else:
         return redirect("/packages/?arch=%s&repo=%s&q=%s" % (
             arch.lower(), repo.title(), name))
diff --git a/templates/packages/details.html b/templates/packages/details.html
index 051726bd..4253f0b3 100644
--- a/templates/packages/details.html
+++ b/templates/packages/details.html
@@ -96,7 +96,8 @@ <h4>Versions Elsewhere</h4>
             <td><a href="{{ pkg.base_package.get_absolute_url }}"
                     title="Package details for {{ pkg.base_package.pkgname }}">{{ pkg.pkgbase }}</a></td>
             {% else %}
-            <td>{{ pkg.pkgbase }}</td>
+            <td><a href="../{{ pkg.pkgbase }}/"
+                    title="Split package details for {{ pkg.pkgbase }}">{{ pkg.pkgbase }}</a></td>
             {% endif %}
         </tr>
         {% endifequal %}
-- 
cgit v1.2.3-54-g00ecf