From 78f23956e090d8e6967467030407738ca6c1d276 Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Mon, 12 Dec 2011 07:03:36 -0600 Subject: Add signoff model admin interface Signed-off-by: Dan McGee --- packages/admin.py | 28 +++++++++++++++++++++++++--- 1 file changed, 25 insertions(+), 3 deletions(-) (limited to 'packages/admin.py') diff --git a/packages/admin.py b/packages/admin.py index 14fa8960..44aa22f3 100644 --- a/packages/admin.py +++ b/packages/admin.py @@ -1,11 +1,12 @@ from django.contrib import admin -from .models import PackageRelation, FlagRequest +from .models import PackageRelation, FlagRequest, Signoff, SignoffSpecification class PackageRelationAdmin(admin.ModelAdmin): - list_display = ('user', 'pkgbase', 'type', 'created') + list_display = ('pkgbase', 'user', 'type', 'created') list_filter = ('type', 'user') - search_fields = ('user__username', 'pkgbase') + search_fields = ('pkgbase', 'user__username') + ordering = ('pkgbase', 'user') date_hierarchy = 'created' class FlagRequestAdmin(admin.ModelAdmin): @@ -13,9 +14,30 @@ class FlagRequestAdmin(admin.ModelAdmin): 'message') list_filter = ('is_spam', 'is_legitimate') search_fields = ('pkgbase', 'user_email', 'message') + ordering = ('-created',) date_hierarchy = 'created' + +class SignoffAdmin(admin.ModelAdmin): + list_display = ('pkgbase', 'pkgver', 'pkgrel', 'arch', 'repo', + 'user', 'created', 'revoked') + list_filter = ('arch', 'repo', 'user') + search_fields = ('pkgbase', 'user__username') + ordering = ('-created',) + date_hierarchy = 'created' + +class SignoffSpecificationAdmin(admin.ModelAdmin): + list_display = ('pkgbase', 'pkgver', 'pkgrel', 'arch', 'repo', + 'user', 'created', 'comments') + list_filter = ('arch', 'repo', 'user') + search_fields = ('pkgbase', 'user__username') + ordering = ('-created',) + date_hierarchy = 'created' + + admin.site.register(PackageRelation, PackageRelationAdmin) admin.site.register(FlagRequest, FlagRequestAdmin) +admin.site.register(Signoff, SignoffAdmin) +admin.site.register(SignoffSpecification, SignoffSpecificationAdmin) # vim: set ts=4 sw=4 et: -- cgit v1.2.3-2-g168b From 99eada17224b54799e7c2331a2b88dee76420107 Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Mon, 12 Dec 2011 09:58:46 -0600 Subject: Use full version in signoff admin list view Signed-off-by: Dan McGee --- packages/admin.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'packages/admin.py') diff --git a/packages/admin.py b/packages/admin.py index 44aa22f3..6d85569d 100644 --- a/packages/admin.py +++ b/packages/admin.py @@ -19,7 +19,7 @@ class FlagRequestAdmin(admin.ModelAdmin): class SignoffAdmin(admin.ModelAdmin): - list_display = ('pkgbase', 'pkgver', 'pkgrel', 'arch', 'repo', + list_display = ('pkgbase', 'full_version', 'arch', 'repo', 'user', 'created', 'revoked') list_filter = ('arch', 'repo', 'user') search_fields = ('pkgbase', 'user__username') @@ -27,7 +27,7 @@ class SignoffAdmin(admin.ModelAdmin): date_hierarchy = 'created' class SignoffSpecificationAdmin(admin.ModelAdmin): - list_display = ('pkgbase', 'pkgver', 'pkgrel', 'arch', 'repo', + list_display = ('pkgbase', 'full_version', 'arch', 'repo', 'user', 'created', 'comments') list_filter = ('arch', 'repo', 'user') search_fields = ('pkgbase', 'user__username') -- cgit v1.2.3-2-g168b From b2b5c1a064d5d3c33f4c4fc119bd67cf9ca1b7ba Mon Sep 17 00:00:00 2001 From: Dan McGee Date: Tue, 10 Jan 2012 23:31:11 -0600 Subject: Add old version string to saved flag requests This makes it easier to match up a flag request with the package state at the time of flagging, and might also help to determine if flagging actions were legit. We only store it if it is the same across all packages to be marked. Also, move the various database write activities when flagging packages into a single transaction. Signed-off-by: Dan McGee --- packages/admin.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'packages/admin.py') diff --git a/packages/admin.py b/packages/admin.py index 6d85569d..4c170247 100644 --- a/packages/admin.py +++ b/packages/admin.py @@ -10,8 +10,8 @@ class PackageRelationAdmin(admin.ModelAdmin): date_hierarchy = 'created' class FlagRequestAdmin(admin.ModelAdmin): - list_display = ('pkgbase', 'created', 'who', 'is_spam', 'is_legitimate', - 'message') + list_display = ('pkgbase', 'version', 'created', 'who', 'is_spam', + 'is_legitimate', 'message') list_filter = ('is_spam', 'is_legitimate') search_fields = ('pkgbase', 'user_email', 'message') ordering = ('-created',) -- cgit v1.2.3-2-g168b