From fe832ea845f07a79b4580f7bca1dcf44b2f215ee Mon Sep 17 00:00:00 2001
From: Dan McGee <dan@archlinux.org>
Date: Sat, 27 Mar 2010 16:15:20 -0500
Subject: Move package maintainer off of package model

This is an attempt to fix our long-standing problems dealing with maintainer
information. Move the actual maintainer information off of the package model
into a PackageRelation object, which has some flexibility to later represent
more than just maintainership.

This solves multiple problems:
* If a package gets accidentally deleted, so did the maintainer info
* Testing packages have always shown up as orphans
* With split packages, it was easy to miss some of the sub-packages

This commit does not include the deletion of the original maintainer column;
that will come at a later time when I feel more confident that the data was
migrated correctly.

Signed-off-by: Dan McGee <dan@archlinux.org>
---
 templates/packages/details.html | 9 ++++++++-
 templates/packages/flagged.html | 2 +-
 templates/packages/search.html  | 6 ++----
 3 files changed, 11 insertions(+), 6 deletions(-)

(limited to 'templates/packages')

diff --git a/templates/packages/details.html b/templates/packages/details.html
index def07501..648b6483 100644
--- a/templates/packages/details.html
+++ b/templates/packages/details.html
@@ -49,7 +49,14 @@
                 <td>{{ pkg.license }}</td>
             </tr><tr>
                 <th>Maintainer:</th>
-                <td>{% if pkg.maintainer %}{{ pkg.maintainer.get_full_name }}{% else %}None{% endif %}</td>
+                {% with pkg.maintainers as maints %}
+                <td>{% if maints %}
+                    {% for m in maints %}
+                    {{ m.get_full_name }}<br/>
+                    {% endfor %}
+                    {% else %}Orphan{% endif %}
+                </td>
+                {% endwith %}
             </tr><tr>
                 <th>Package Size:</th>
                 <td>{{ pkg.compressed_size|filesizeformat }}</td>
diff --git a/templates/packages/flagged.html b/templates/packages/flagged.html
index 64cb2452..3461bbda 100644
--- a/templates/packages/flagged.html
+++ b/templates/packages/flagged.html
@@ -3,6 +3,6 @@
 
 {% block content %}
     <p>
-    {{pkg.pkgname}} on {{pkg.arch}} has already been flagged out of date.
+    {{pkg.pkgname}} has already been flagged out of date.
     </p>
 {% endblock %}
diff --git a/templates/packages/search.html b/templates/packages/search.html
index e760788e..4f7bc776 100644
--- a/templates/packages/search.html
+++ b/templates/packages/search.html
@@ -44,7 +44,7 @@
         <table class="results" width="100%">
             {% if paginator %}
                 <tr>
-                    <td colspan="{% if user.is_authenticated %}6{% else %}5{% endif %}">
+                    <td colspan="{% if user.is_authenticated %}5{% else %}4{% endif %}">
                         {{paginator.count}} packages found.
                         Page {{page_obj.number}} of {{paginator.num_pages}}.
                     </td>
@@ -77,7 +77,6 @@
                 <th><a href="/packages/{% buildsortqs "pkgname" %}">Name</a></th>
                 <th>Version</th>
                 <th>Description</th>
-                <th><a href="/packages/{% buildsortqs "maintainer" %}">Maintainer</a></th>
                 <th><a href="/packages/{% buildsortqs "-last_update" %}">Last Updated</a></th>
 
             </tr>
@@ -95,13 +94,12 @@
                     <td>{{ pkg.pkgver }}-{{ pkg.pkgrel }}</td>
                 {% endif %}
                     <td>{{ pkg.pkgdesc }}</td>
-                    <td>{{ pkg.maintainer|default:"Orphan" }}</td>
                     <td>{{ pkg.last_update|date:"Y-m-d" }}</td>
                 </tr>
             {% endfor %}
             {% if paginator %}
                 <tr>
-                    <td colspan="{% if user.is_authenticated %}6{% else %}5{% endif %}">
+                    <td colspan="{% if user.is_authenticated %}5{% else %}4{% endif %}">
                         {{paginator.count}} packages found.
                         Page {{page_obj.number}} of {{paginator.num_pages}}.
                     </td>
-- 
cgit v1.2.3-2-g168b