Backend: Fix models and views

2 files changed, 5 insertions, 19 deletions

diff --git a/backend/models.py b/backend/models.py
index 5a68429..3adf604 100644
--- a/backend/models.py
+++ b/backend/models.py
@@ -10,7 +10,7 @@ import json
 class SJSettingsModel(models.Model):
     """ ScannerJammer abstract settings model
     """
-    settings_text = models.TextField(blank=True)
+    settings_text = models.TextField(blank=True, default='{}')
 
     class Meta:
         abstract = True
@@ -35,23 +35,16 @@ class SJUserProfile(SJSettingsModel):
     """ ScannerJammer user model
     """
     user = models.OneToOneField(auth.models.User)
-    nickname = models.CharField(max_length=32, blank=True)
+    nickname = models.CharField(max_length=32, blank=True, default='')
     score = models.IntegerField(default=0, blank=True)
     access = models.IntegerField(default=0, blank=True)
     bio = 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.DateTimeField(blank=True, verbose_name="Join Date") # see User.date_joined
-    seendate = models.DateTimeField(blank=True, verbose_name="Seen Date") # see User.last_login
 
     class Meta:
         verbose_name = "SJ User Profile"
 
     def __unicode__(self):
-        if self.nickname:
-            return "%s (%s)" % (self.username or self.user.username, self.nickname)
-        return "%s" % (self.username or self.user.username)
+        return "%s (%s)" % (self.user.username, self.nickname)
 
 class SJUserProfileAdmin(admin.ModelAdmin):
     list_display = (
@@ -60,8 +53,6 @@ class SJUserProfileAdmin(admin.ModelAdmin):
         'score',
         'access',
         'bio',
-        'joindate',
-        'seendate',
     )
 
 class SJUserActivity(models.Model):
@@ -114,7 +105,7 @@ class SJContent(SJUserActivity, SJSettingsModel):
         verbose_name = "SJ Content"
 
     def __unicode__(self):
-        return '%s\'s %s' % (self.user, self.content_type)
+        return '%s\'s %s %s' % (self.user, self.content_type, self.datetime)
 
 
 class SJContentAdmin(admin.ModelAdmin):
diff --git a/backend/views.py b/backend/views.py
index 132649b..f0cfb3f 100644
--- a/backend/views.py
+++ b/backend/views.py
@@ -159,11 +159,7 @@ def api_auth_register(request):
         user.save()
     except:
         return api_error_headers('db error')
-    user_profile = SJUserProfile(user=user,
-                                 username=request.POST['username'],
-                                 password=request.POST['password'],
-                                 joindate=user.date_joined,
-                                 seendate=user.date_joined)
+    user_profile = SJUserProfile(user=user)
     try:
         user_profile.save()
     except:
@@ -208,7 +204,6 @@ def api_auth_password(request):
             user.set_password(request.POST['password'])
             user.save()
             user_profile = user.get_profile()
-            user_profile.password = request.POST['password']
             user_profile.save()
         except auth.models.User.DoesNotExist:
             return api_error_headers('no such user')