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/devel/index.html | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

(limited to 'templates/devel')

diff --git a/templates/devel/index.html b/templates/devel/index.html
index 12c0791e..acbe90bf 100644
--- a/templates/devel/index.html
+++ b/templates/devel/index.html
@@ -65,18 +65,17 @@ <h3 class="title" style="cursor: pointer" onclick="$(this).next().toggle();">Sta
 	<br /><br />
 
 	<div class="greybox">
+        <div>Counts are by 'pkgbase' and not raw number of packages.</div>
         <h3 class="title" style="cursor: pointer" onclick="$(this).next().toggle();">Stats by Maintainer</h3>
         <table class="results" width="100%" style="display: none">
 			<tr>
 				<th width="50%">Maintainer</th>
 				<th># Packages</th>
-				<th># Flagged</th>
 			</tr>
 		{% for maint in maintainers %}
             <tr class="{% cycle pkgr2,pkgr1 %}">
 				<td><strong>{{ maint.get_full_name }}</strong></td>
-				<td><a href="/packages/?maintainer={{ maint.username }}"><strong>{{ maint.maintained_packages.count }}</strong> packages</a></td>
-				<td><a href="/packages/?maintainer={{ maint.username }}&flagged=Flagged"><strong>{{ maint.maintained_packages.flagged.count }}</strong> packages</a></td>
+				<td><a href="/packages/?maintainer={{ maint.username }}"><strong>{{ maint.package_relations.count }}</strong> packages</a></td>
 			</tr>
 		{% endfor %}
 		</table>
@@ -99,7 +98,7 @@ <h3 class="title">My Flagged Packages</h3>
 				<th>Version</th>
 				<th>Arch</th>
 			</tr>
-                {% for pkg in user.maintained_packages.flagged %}
+                {% for pkg in flagged %}
                 <tr class="{% cycle pkgr2,pkgr1 %}">
                     <td>
                         <a href="{{ pkg.get_absolute_url }}">{{ pkg.pkgname }}</a>
-- 
cgit v1.2.3-54-g00ecf