Fehler bei Vergabe von Bonuspunkte korrigiert.
Kommentare für Bonuspunkte werden jetzt als Kommentar beim Spieler hinterlassen, nicht als Kommentar in der Hanchan. FIXED: 3_in_a_row counter wurde nicht zurückgesetzt wenn Bonuspunkte vergeben wurden. FIXED: Durchschnittliche Platzierung während eines Events wurde nur als Ganzzahl berechnet. Wird nun als Fießkomma berechnet und gesichert.
This commit is contained in:
@@ -7,9 +7,8 @@ Created on 19.09.2011
|
||||
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.forms import ReadOnlyPasswordHashField
|
||||
from django.utils.translation import ugettext as _
|
||||
from imagekit.admin import AdminThumbnail
|
||||
|
||||
from membership.models import Membership, ActivationRequest
|
||||
|
||||
@@ -30,10 +29,12 @@ def cleanup_activation(modeladmin, request, queryset):
|
||||
activation.user.delete()
|
||||
|
||||
|
||||
cleanup_activation.short_description = _("Cleanup selected Activation Requests")
|
||||
cleanup_activation.short_description = _(
|
||||
"Cleanup selected Activation Requests")
|
||||
|
||||
|
||||
class ProxyGroup(Group):
|
||||
|
||||
class Meta:
|
||||
proxy = True
|
||||
verbose_name = _('Group')
|
||||
@@ -41,10 +42,10 @@ class ProxyGroup(Group):
|
||||
|
||||
|
||||
class MembershipAdmin(UserAdmin):
|
||||
admin_thumbnail = AdminThumbnail(image_field='thumbnail')
|
||||
# admin_thumbnail = AdminThumbnail(image_field='thumbnail')
|
||||
list_filter = ('membership', 'confirmed')
|
||||
list_display = (
|
||||
'admin_thumbnail',
|
||||
'avatar',
|
||||
'username',
|
||||
'first_name',
|
||||
'last_name',
|
||||
@@ -55,11 +56,11 @@ class MembershipAdmin(UserAdmin):
|
||||
list_editable = ('confirmed', 'paid_until',)
|
||||
list_display_links = ('username',)
|
||||
fieldsets = (
|
||||
(None, {'fields': (('username', 'password'), 'gender',
|
||||
(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'))}),
|
||||
'street_name', ('post_code', 'city'))}),
|
||||
(_('Permissions'), {'fields': ('is_active', 'is_staff', 'is_superuser',
|
||||
'groups', 'user_permissions')}),
|
||||
(_('Important dates'), {'fields': ('last_login', 'date_joined')}),
|
||||
|
||||
Reference in New Issue
Block a user