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

@@ -1,7 +1,10 @@
# -*- encoding: utf-8 -*-
from . import PAID_MEMBERSHIP_GROUP
from datetime import timedelta
from os import path
import random
import hashlib
from django.utils import timezone
from django.conf import settings
from django.contrib.auth import get_user_model
@@ -10,10 +13,10 @@ from django.db import models
from django.utils.translation import ugettext as _
from imagekit.models import ImageSpecField
from imagekit.processors import SmartResize
from os import path
from . import PAID_MEMBERSHIP_GROUP
from utils import OverwriteStorage
import random
import hashlib
GENDER_CHOICES = (
('m', _('Male')),
@@ -150,7 +153,8 @@ class MembershipManager(models.Manager):
if user:
return super(MembershipManager, self).get(user=user)
elif username:
return super(MembershipManager, self).get(user__username=username)
return super(MembershipManager, self).get(
user__username=username)
except Membership.DoesNotExist:
if username:
user = get_user_model().objects.get(username=username)