Browse Source

Removed dupe field from User model

Rafał Pitoń 11 years ago
parent
commit
ca9d1dd62d

+ 2 - 2
misago/users/middleware.py

@@ -38,9 +38,9 @@ class OnlineTrackerMiddleware(object):
                 if request.user.is_anonymous():
                 if request.user.is_anonymous():
                     # User logged off, update his last visit and blam tracker
                     # User logged off, update his last visit and blam tracker
                     user = tracker.user
                     user = tracker.user
-                    user.last_active = tracker.last_click
+                    user.last_login = tracker.last_click
                     user.last_ip = tracker.current_ip
                     user.last_ip = tracker.current_ip
-                    user.save(update_fields=['last_active', 'last_ip'])
+                    user.save(update_fields=['last_login', 'last_ip'])
                 else:
                 else:
                     # Bump user's tracker time
                     # Bump user's tracker time
                     tracker.current_ip = request._misago_real_ip
                     tracker.current_ip = request._misago_real_ip

+ 0 - 1
misago/users/migrations/0001_initial.py

@@ -29,7 +29,6 @@ class Migration(migrations.Migration):
                 ('email_hash', models.CharField(unique=True, max_length=32)),
                 ('email_hash', models.CharField(unique=True, max_length=32)),
                 ('joined_on', models.DateTimeField(default=django.utils.timezone.now, verbose_name='joined on')),
                 ('joined_on', models.DateTimeField(default=django.utils.timezone.now, verbose_name='joined on')),
                 ('joined_from_ip', models.GenericIPAddressField()),
                 ('joined_from_ip', models.GenericIPAddressField()),
-                ('last_active', models.DateTimeField(null=True, blank=True)),
                 ('last_ip', models.GenericIPAddressField(null=True, blank=True)),
                 ('last_ip', models.GenericIPAddressField(null=True, blank=True)),
                 ('presence_visibility', models.PositiveIntegerField(default=0)),
                 ('presence_visibility', models.PositiveIntegerField(default=0)),
                 ('timezone', models.CharField(max_length=255, default='utc')),
                 ('timezone', models.CharField(max_length=255, default='utc')),

+ 0 - 1
misago/users/models/user.py

@@ -152,7 +152,6 @@ class User(AbstractBaseUser, PermissionsMixin):
     email_hash = models.CharField(max_length=32, unique=True)
     email_hash = models.CharField(max_length=32, unique=True)
     joined_on = models.DateTimeField(_('joined on'), default=timezone.now)
     joined_on = models.DateTimeField(_('joined on'), default=timezone.now)
     joined_from_ip = models.GenericIPAddressField()
     joined_from_ip = models.GenericIPAddressField()
-    last_active = models.DateTimeField(null=True, blank=True)
     last_ip = models.GenericIPAddressField(null=True, blank=True)
     last_ip = models.GenericIPAddressField(null=True, blank=True)
     presence_visibility = models.PositiveIntegerField(
     presence_visibility = models.PositiveIntegerField(
         default=PRESENCE_VISIBILITY_ALL)
         default=PRESENCE_VISIBILITY_ALL)