Paginator der besser ins Design passt.

This commit is contained in:
Christian Berg
2014-12-10 00:23:36 +01:00
parent 2011d3ce25
commit 711c303f9a
75 changed files with 675 additions and 1599 deletions

View File

@@ -9,7 +9,6 @@ from django.contrib.auth import get_user_model
from mahjong_ranking.models import KyuDanRanking, LadderRanking, LadderSeason
from utils import mixins
from . import forms, models
@@ -49,7 +48,8 @@ class ActivateRegistration(generic.DetailView):
def login(self, user):
backend = auth.get_backends()[0]
user.backend = "%s.%s" % (backend.__module__, backend.__class__.__name__) # @IgnorePep8
user.backend = "%s.%s" % (
backend.__module__, backend.__class__.__name__) # @IgnorePep8
auth.login(self.request, user)
messages.success(self.request, _('Activation successful. \
You can now login anytime with you username and password.'))
@@ -81,7 +81,8 @@ class MembershipDetail(mixins.LoginRequiredMixin, generic.DetailView):
def get_object(self, queryset=None):
if self.kwargs.get('username'):
user = get_object_or_404(get_user_model(), username=self.kwargs['username'])
user = get_object_or_404(get_user_model(),
username=self.kwargs['username'])
return models.Membership.objects.get_or_create(user=user)[0]
elif self.request.user.is_authenticated():
return models.Membership.objects.get(user=self.request.user)