diff options
| -rw-r--r-- | backend/models.py | 49 |
1 files changed, 19 insertions, 30 deletions
diff --git a/backend/models.py b/backend/models.py index 09e819f..4d1b70b 100644 --- a/backend/models.py +++ b/backend/models.py @@ -1,23 +1,25 @@ -""" ScannerJammer models +""" ScannerJammer models module """ from django.db import models +from django.contrib import auth -class SJUser(models.Model): +class SJUserProfile(models.Model): """ ScannerJammer user model """ - username = models.CharField(max_length=32) - nickname = models.CharField(max_length=32) - password = models.CharField(max_length=32) + user = models.OneToOneField(auth.models.User) + nickname = models.CharField(max_length=32, blank=True) score = models.IntegerField(default=0) - joindate = models.DateField() - seendate = models.DateField() - access = models.IntegerField(default=0) - bio = models.TextField() - settings = models.TextField() + bio = models.TextField(blank=True) + settings = models.TextField(blank=True) + # Backward compatibility fields + username = models.CharField(max_length=32, blank=True) # see User.username + password = models.CharField(max_length=32, blank=True) # see User.password (store password hash) + joindate = models.DateField(blank=True) # see User.date_joined + seendate = models.DateField(blank=True) # see User.last_login def __unicode__(self): - return "%s(%s)" % (self.username, self.nickname) + return "%s(%s)" % (self.username or self.user.username, self.nickname) class SJRoom(models.Model): """ ScannerJammer room model """ @@ -32,45 +34,32 @@ class SJRoom(models.Model): class SJSiteModel(models.Model): """ ScannerJammer site base model """ - user = models.ForeignKey(SJUser) + user = models.ForeignKey(auth.models.User) room = models.ForeignKey(SJRoom) date = models.DateField() - -class SJBackground(SJSiteModel): - """ ScannerJammer background model """ - url = models.URLField() + url = models.URLField(blank=True) def __unicode__(self): return self.url +class SJBackground(SJSiteModel): + """ ScannerJammer background model """ + pass + class SJURL(SJSiteModel): """ ScannerJammer url model """ - url = models.URLField() likes = models.IntegerField(default=0) - # redundant column - username = models.CharField(max_length=32) - - def __unicode__(self): - return self.url class SJVideo(SJSiteModel): """ ScannerJammer video model """ - url = models.URLField() title = models.CharField(max_length=100) likes = models.IntegerField(default=0) removed = models.BooleanField(default=False) thumbnail = models.CharField(max_length=64) - # redundant column - username = models.CharField(max_length=32) - - def __unicode__(self): - return self.url class SJChat(SJSiteModel): """ ScannerJammer chat model """ msg = models.TextField() - # redundant column - username = models.CharField(max_length=32) class SJSearchLog(models.Model): """ SannerJammer search log """ |