Milestone 08-14
* Mahjong Ranking wurde stark vereinfacht um Fehler besser vorzubeugen. * Online WYSIWYG Editor auf CKEditor umgeändert, damit online bearbeiten für unbedarfte besser funktioniert. * Viele kleine Optimierungen am CSS für bessere Performance. * CSS wird jetzt aus LESS Code generiert * Für dise Arbeit wird jetzt grunt und node package management lokal verwendet.
This commit is contained in:
@@ -7,7 +7,6 @@ import hashlib
|
||||
|
||||
from django.utils import timezone
|
||||
from django.conf import settings
|
||||
from django.contrib import auth
|
||||
from django.contrib.auth.models import AbstractUser
|
||||
from django.core.urlresolvers import reverse
|
||||
from django.db import models
|
||||
@@ -140,30 +139,6 @@ class ActivationRequest(models.Model):
|
||||
def username(self):
|
||||
return self.user.username
|
||||
|
||||
'''
|
||||
class MembershipManager(models.Manager):
|
||||
def get(self, user=None, username=None, **kwargs):
|
||||
"""
|
||||
First try's to fetch the requested Membership Object from the Database,
|
||||
if the requestetd Membership does not Exists (yet) try to fetch the
|
||||
corresponding User, and create the Membership with the filled in
|
||||
Userdata.
|
||||
"""
|
||||
try:
|
||||
if username and not user:
|
||||
user = auth.get_user_model().objects.get(username=username)
|
||||
return super(MembershipManager, self).get(user=user)
|
||||
except Membership.DoesNotExist:
|
||||
membership = Membership(
|
||||
user=user,
|
||||
nickname=user.username,
|
||||
first_name=user.first_name,
|
||||
last_name=user.last_name,
|
||||
email=user.email
|
||||
)
|
||||
membership.save()
|
||||
return membership
|
||||
'''
|
||||
|
||||
class Membership(AbstractUser):
|
||||
# user = models.OneToOneField(settings.AUTH_USER_MODEL)
|
||||
@@ -242,7 +217,7 @@ class Membership(AbstractUser):
|
||||
)
|
||||
|
||||
class Meta(object):
|
||||
ordering = ('last_name', 'first_name',)
|
||||
ordering = ('username', )
|
||||
swappable = 'AUTH_USER_MODEL'
|
||||
verbose_name = _('Membership')
|
||||
verbose_name_plural = _('Memberships')
|
||||
|
||||
Reference in New Issue
Block a user