summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDusty Phillips <buchuki@gmail.com>2009-04-14 04:11:10 +0200
committerDusty Phillips <buchuki@gmail.com>2009-04-14 04:14:53 +0200
commitbb93f05f56f2b22a662f85736549a72735864b20 (patch)
tree0426384992ef3845ce86121f8782232b9e25f3be
parenta9fd048f5499529a264ac7bf3ea52a14e1cbd97e (diff)
downloadarchweb-bb93f05f56f2b22a662f85736549a72735864b20.tar.gz
archweb-bb93f05f56f2b22a662f85736549a72735864b20.tar.xz
FS#11325. Add a 'Target Repo' column to the signoffs page.
-rw-r--r--packages/views.py11
-rw-r--r--templates/packages/signoffs.html4
2 files changed, 13 insertions, 2 deletions
diff --git a/packages/views.py b/packages/views.py
index e986409..49ab9a0 100644
--- a/packages/views.py
+++ b/packages/views.py
@@ -151,8 +151,17 @@ def unflag(request, pkgid):
def signoffs(request):
packages = Package.objects.filter(repo__name="Testing").order_by("pkgname")
+ package_list = []
+ other_packages = Package.objects.exclude(repo__name="Testing")
+ for package in packages:
+ other_package = other_packages.filter(pkgname=package.pkgname)
+ if len(other_package):
+ repo = other_package[0].repo.name
+ else:
+ repo = "Unknown"
+ package_list.append((package, repo))
return render_to_response('packages/signoffs.html',
- RequestContext(request, {'packages': packages}))
+ RequestContext(request, {'packages': package_list}))
def signoff_package(request, arch, pkgname):
pkg = get_object_or_404(Package,
diff --git a/templates/packages/signoffs.html b/templates/packages/signoffs.html
index e422adb..cb6a848 100644
--- a/templates/packages/signoffs.html
+++ b/templates/packages/signoffs.html
@@ -10,15 +10,17 @@
<th>Package</th>
<th>Version</th>
<th>Last Updated</th>
+ <th>Target Repo</th>
<th>Approved</th>
<th>Signoff</th>
</tr>
- {% for pkg in packages %}
+ {% for pkg,target in packages %}
<tr class="{% cycle pkgr2,pkgr1 %}">
<td>{{ pkg.arch.name }}</td>
<td><a href="{{ pkg.get_absolute_url }}">{{ pkg.pkgname }}</a></td>
<td>{{ pkg.pkgver }}-{{ pkg.pkgrel }}</td>
<td>{{ pkg.last_update }}</td>
+ <td>{{ target }}</td>
<td class="signoff_{{pkg.approved_for_signoff|yesno}}">{{ pkg.approved_for_signoff|yesno:"Yes,No" }}</td>
<td>
<ul>