fe832ea845
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>
111 lines
3.4 KiB
Python
111 lines
3.4 KiB
Python
import re
|
|
from django import forms
|
|
from django.contrib import admin
|
|
from django.contrib.auth.models import User
|
|
from django.contrib.auth.admin import UserAdmin
|
|
from main.models import (AltForum, Arch, Donor,
|
|
Mirror, MirrorProtocol, MirrorUrl, MirrorRsync,
|
|
Package, Press, Repo, UserProfile, ExternalProject)
|
|
|
|
class AltForumAdmin(admin.ModelAdmin):
|
|
list_display = ('language', 'name')
|
|
list_filter = ('language',)
|
|
ordering = ['name']
|
|
search_fields = ('name',)
|
|
|
|
class DonorAdmin(admin.ModelAdmin):
|
|
ordering = ['name']
|
|
search_fields = ('name',)
|
|
|
|
class MirrorUrlForm(forms.ModelForm):
|
|
class Meta:
|
|
model = MirrorUrl
|
|
def clean_url(self):
|
|
# ensure we always save the URL with a trailing slash
|
|
url = self.cleaned_data["url"].strip()
|
|
if url[-1] == '/':
|
|
return url
|
|
return url + '/'
|
|
|
|
class MirrorUrlInlineAdmin(admin.TabularInline):
|
|
model = MirrorUrl
|
|
form = MirrorUrlForm
|
|
extra = 3
|
|
|
|
# ripped off from django.forms.fields, adding netmask ability
|
|
ipv4nm_re = re.compile(r'^(25[0-5]|2[0-4]\d|[0-1]?\d?\d)(\.(25[0-5]|2[0-4]\d|[0-1]?\d?\d)){3}(/(\d|[1-2]\d|3[0-2])){0,1}$')
|
|
class IPAddressNetmaskField(forms.fields.RegexField):
|
|
default_error_messages = {
|
|
'invalid': u'Enter a valid IPv4 address, possibly including netmask.',
|
|
}
|
|
|
|
def __init__(self, *args, **kwargs):
|
|
super(IPAddressNetmaskField, self).__init__(ipv4nm_re, *args, **kwargs)
|
|
|
|
class MirrorRsyncForm(forms.ModelForm):
|
|
class Meta:
|
|
model = MirrorRsync
|
|
ip = IPAddressNetmaskField(label='IP')
|
|
|
|
class MirrorRsyncInlineAdmin(admin.TabularInline):
|
|
model = MirrorRsync
|
|
form = MirrorRsyncForm
|
|
extra = 2
|
|
|
|
class MirrorAdminForm(forms.ModelForm):
|
|
class Meta:
|
|
model = Mirror
|
|
upstream = forms.ModelChoiceField(queryset=Mirror.objects.filter(tier__gte=0, tier__lte=1), required=False)
|
|
|
|
class MirrorAdmin(admin.ModelAdmin):
|
|
form = MirrorAdminForm
|
|
list_display = ('name', 'tier', 'country', 'active', 'public', 'isos', 'admin_email', 'supported_protocols')
|
|
list_filter = ('tier', 'country', 'active', 'public')
|
|
ordering = ['country', 'name']
|
|
search_fields = ('name',)
|
|
inlines = [
|
|
MirrorUrlInlineAdmin,
|
|
MirrorRsyncInlineAdmin,
|
|
]
|
|
|
|
class RepoAdmin(admin.ModelAdmin):
|
|
list_display = ('name', 'testing')
|
|
list_filter = ('testing',)
|
|
search_fields = ('name',)
|
|
|
|
class PackageAdmin(admin.ModelAdmin):
|
|
list_display = ('pkgname', 'repo', 'arch', 'last_update')
|
|
list_filter = ('repo', 'arch')
|
|
ordering = ['pkgname']
|
|
search_fields = ('pkgname',)
|
|
|
|
class PressAdmin(admin.ModelAdmin):
|
|
list_display = ('name', 'url')
|
|
ordering = ['name']
|
|
search_fields = ('name',)
|
|
|
|
admin.site.unregister(User)
|
|
class UserProfileInline(admin.StackedInline):
|
|
model = UserProfile
|
|
|
|
class UserProfileAdmin(UserAdmin):
|
|
inlines = [UserProfileInline]
|
|
list_display = ('username', 'email', 'first_name', 'last_name', 'is_staff', 'is_active')
|
|
list_filter = ('is_staff', 'is_superuser', 'is_active')
|
|
|
|
|
|
admin.site.register(User, UserProfileAdmin)
|
|
admin.site.register(AltForum, AltForumAdmin)
|
|
admin.site.register(Donor, DonorAdmin)
|
|
|
|
admin.site.register(Mirror, MirrorAdmin)
|
|
admin.site.register(MirrorProtocol)
|
|
|
|
admin.site.register(Package, PackageAdmin)
|
|
admin.site.register(Press, PressAdmin)
|
|
admin.site.register(Arch)
|
|
admin.site.register(Repo, RepoAdmin)
|
|
admin.site.register(ExternalProject)
|
|
|
|
# vim: set ts=4 sw=4 et:
|