Diverse Code Cleanups
*Code wurde PEP-8 gerecht formatiert * Kleine Fehler die der PyCharm Inspector beanstandet wurden korrigiert
This commit is contained in:
committed by
Christian Berg
parent
f34281089d
commit
86a0db050d
@@ -4,16 +4,17 @@ from django.contrib import auth, messages
|
||||
from django.core.urlresolvers import reverse
|
||||
from django.utils.translation import ugettext as _
|
||||
from django.views import generic
|
||||
|
||||
from mahjong_ranking.models import KyuDanRanking, LadderRanking, LadderSeason
|
||||
import forms
|
||||
import models
|
||||
from utils import mixins
|
||||
|
||||
from . import forms, models
|
||||
|
||||
|
||||
class ActivateRegistration(generic.DetailView):
|
||||
'''
|
||||
"""
|
||||
Activates the Registration of an User and logs him in
|
||||
'''
|
||||
"""
|
||||
template_name = 'membership/activation_error.html'
|
||||
|
||||
def get(self, request, **kwargs):
|
||||
@@ -79,7 +80,7 @@ class MembershipDetail(mixins.LoginRequiredMixin, generic.DetailView):
|
||||
|
||||
def get_object(self, queryset=None):
|
||||
if self.kwargs.get('username'):
|
||||
return models.Membership.objects.get(username=self.kwargs['username'])
|
||||
return models.Membership.objects.get_or_create(username=self.kwargs['username'])[0]
|
||||
elif self.request.user.is_authenticated():
|
||||
return models.Membership.objects.get(user=self.request.user)
|
||||
|
||||
@@ -88,13 +89,13 @@ class MembershipDetail(mixins.LoginRequiredMixin, generic.DetailView):
|
||||
try:
|
||||
context['kyu_dan_ranking'] = KyuDanRanking.objects.get(
|
||||
user_id=self.object.user_id)
|
||||
except:
|
||||
except KyuDanRanking.DoesNotExist:
|
||||
context['kyu_dan_ranking'] = None
|
||||
try:
|
||||
context['ladder_ranking'] = LadderRanking.objects.get(
|
||||
user_id=self.object.user_id,
|
||||
season=LadderSeason.objects.current())
|
||||
except:
|
||||
except LadderRanking.DoesNotExist:
|
||||
context['ladder_ranking'] = LadderRanking(user=self.object.user)
|
||||
return context
|
||||
|
||||
|
||||
Reference in New Issue
Block a user