Merge e9e2e9a into c86190b

rafalp · Aug 18, 2018 · 0724b3a · 0724b3a
2 parents c86190b + e9e2e9a
commit 0724b3a
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/misago/users/migrations/0012_audittrail.py b/misago/users/migrations/0012_audittrail.py
@@ -21,7 +21,7 @@ class Migration(migrations.Migration):
             fields=[
                 ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
                 ('object_id', models.PositiveIntegerField()),
-                ('created_at', models.DateTimeField(db_index=True, default=django.utils.timezone.now)),
+                ('created_on', models.DateTimeField(db_index=True, default=django.utils.timezone.now)),
                 ('ip_address', models.GenericIPAddressField()),
                 ('content_type', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='contenttypes.ContentType')),
                 ('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)),

diff --git a/misago/users/models/audittrail.py b/misago/users/models/audittrail.py
@@ -7,7 +7,7 @@
 
 class AuditTrail(models.Model):
     user = models.ForeignKey(settings.AUTH_USER_MODEL, on_delete=models.CASCADE)
-    created_at = models.DateTimeField(db_index=True, default=timezone.now)
+    created_on = models.DateTimeField(db_index=True, default=timezone.now)
     ip_address = models.GenericIPAddressField()
 
     content_type = models.ForeignKey(ContentType, on_delete=models.CASCADE)

diff --git a/misago/users/signals.py b/misago/users/signals.py
@@ -58,8 +58,8 @@ def archive_user_avatar(sender, archive=None, **kwargs):
 def archive_user_audit_trail(sender, archive=None, **kwargs):
     queryset = sender.audittrail_set.order_by('id')
     for audit_trail in chunk_queryset(queryset):
-        item_name = audit_trail.created_at.strftime('%H%M%S-audit-trail')
-        archive.add_text(item_name, audit_trail.ip_address, date=audit_trail.created_at)
+        item_name = audit_trail.created_on.strftime('%H%M%S-audit-trail')
+        archive.add_text(item_name, audit_trail.ip_address, date=audit_trail.created_on)
 
 
 @receiver(archive_user_data)
@@ -94,4 +94,4 @@ def remove_old_registrations_ips(sender, **kwargs):
 @receiver(remove_old_ips)
 def remove_old_audit_trails(sender, **kwargs):
     removal_cutoff = timezone.now() - timedelta(days=settings.MISAGO_IP_STORE_TIME)
-    AuditTrail.objects.filter(created_at__lte=removal_cutoff).delete()
+    AuditTrail.objects.filter(created_on__lte=removal_cutoff).delete()
diff --git a/misago/users/tests/test_audittrail.py b/misago/users/tests/test_audittrail.py
@@ -179,7 +179,7 @@ def test_old_audit_trail_is_removed(self):
         user = self.get_authenticated_user()
         audit_trail = create_user_audit_trail(user, USER_IP, self.obj)
 
-        audit_trail.created_at = timezone.now() - timedelta(days=50)
+        audit_trail.created_on = timezone.now() - timedelta(days=50)
         audit_trail.save()
 
         remove_old_ips.send(None)