Vereinfachung Membership ist nun ein custom login model, keine Abhängikeiten mehr zu auth.User.
absofort können alle Benutzer ins Ranking eingetragen werden und nicht mehr nur "zahlende Mitglieder".
This commit is contained in:
committed by
Christian Berg
parent
37d3cb78c1
commit
617b7131fe
@@ -83,7 +83,7 @@ class MembershipDetail(mixins.LoginRequiredMixin, generic.DetailView):
|
||||
if self.kwargs.get('username'):
|
||||
return models.Membership.objects.get(username=self.kwargs['username'])
|
||||
elif self.request.user.is_authenticated():
|
||||
return models.Membership.objects.get(user=self.request.user)
|
||||
return self.request.user
|
||||
except models.Membership.DoesNotExist:
|
||||
raise Http404(_("No %(verbose_name)s found matching the query") %
|
||||
{'verbose_name': self.model._meta.verbose_name})
|
||||
@@ -92,15 +92,15 @@ class MembershipDetail(mixins.LoginRequiredMixin, generic.DetailView):
|
||||
context = generic.DetailView.get_context_data(self, **kwargs)
|
||||
try:
|
||||
context['kyu_dan_ranking'] = KyuDanRanking.objects.get(
|
||||
user_id=self.object.user_id)
|
||||
user=self.object)
|
||||
except KyuDanRanking.DoesNotExist:
|
||||
context['kyu_dan_ranking'] = None
|
||||
try:
|
||||
context['ladder_ranking'] = LadderRanking.objects.get(
|
||||
user_id=self.object.user_id,
|
||||
user=self.object,
|
||||
season=LadderSeason.objects.current())
|
||||
except LadderRanking.DoesNotExist:
|
||||
context['ladder_ranking'] = LadderRanking(user=self.object.user)
|
||||
context['ladder_ranking'] = LadderRanking(user=self.object)
|
||||
return context
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user