Another Step in the Quest to clean up the code base.

This commit is contained in:
2017-09-08 07:19:50 +02:00
parent ce218080b2
commit b3ab9798b5
229 changed files with 1915 additions and 15175 deletions

View File

@@ -1,19 +1,16 @@
"""
Created on 19.09.2011
@author: christian
"""
""" Admin Interface to manage the memberships."""
# import stuff we need from django
from django.contrib import admin
from django.contrib.auth.models import Group
from django.contrib.auth.admin import UserAdmin, GroupAdmin
# from django.contrib.auth.forms import ReadOnlyPasswordHashField
from django.contrib.auth.models import Group
from django.utils.translation import ugettext as _
from easy_thumbnails import fields, widgets
from membership.models import Membership, ActivationRequest
def activate_user(modeladmin, request, queryset):
def activate_user(modeladmin, request, queryset): # Ignore PyLintBear (W0613)
"""Triggers activation of the selects actication requests by hand."""
for activation in queryset:
membership = Membership.objects.get(username=activation.user.username)
membership.save()
@@ -23,7 +20,8 @@ def activate_user(modeladmin, request, queryset):
activate_user.short_description = _('Activate selected User')
def cleanup_activation(modeladmin, request, queryset):
def cleanup_activation(modeladmin, request, queryset): # Ignore PyLintBear (W0613)
"""Delete every selected activation request that has been expired."""
for activation in queryset:
if activation.expired:
activation.user.delete()
@@ -34,18 +32,23 @@ cleanup_activation.short_description = _(
class ProxyGroup(Group):
"""A Proxy to list Usergroups from django.contrib.auth here."""
class Meta:
""" MetaData to localize this Proxy Group."""
proxy = True
verbose_name = _('Group')
verbose_name_plural = _('Groups')
class MembershipAdmin(UserAdmin):
# admin_thumbnail = AdminThumbnail(image_field='thumbnail')
"""Admin interface to manage membership. e.g. users."""
formfield_overrides = {
fields.ThumbnailerImageField: {
'widget': widgets.ImageClearableFileInput},
}
list_filter = ('is_active', 'membership', 'confirmed')
list_display = (
'avatar',
'username',
'first_name',
'last_name',
@@ -60,8 +63,10 @@ class MembershipAdmin(UserAdmin):
(None, {'fields': (('username', 'password'), 'gender', 'avatar',
('first_name', 'last_name'), ('email', 'website'))}),
(_('Membership'), {'classes': ('collapse',),
'fields': (('membership', 'confirmed'), 'birthday', 'telephone',
'street_name', ('post_code', 'city'))}),
'fields': (
('membership', 'confirmed'), 'birthday',
'telephone',
'street_name', ('post_code', 'city'))}),
(_('Permissions'), {'fields': ('is_active', 'is_staff', 'is_superuser',
'groups', 'user_permissions')}),
(_('Important dates'), {'fields': ('last_login', 'date_joined')}),
@@ -74,6 +79,8 @@ admin.site.register(Membership, MembershipAdmin)
class RegistrationAdmin(admin.ModelAdmin):
"""To administrag user activation requests.
Kasu uses an two factor registration via email."""
list_display = ('username', 'first_name', 'last_name', 'email',
'registration_date', 'expired')
search_fields = ('user__username', 'user__first_name')