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/search.html | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

(limited to 'templates/packages/search.html')

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 @@ <h4 style="text-align: right">Search Criteria</h4>
         <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 @@ <h4 style="text-align: right">Search Criteria</h4>
                 <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 @@ <h4 style="text-align: right">Search Criteria</h4>
                     <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-54-g00ecf