Fix some inconsistencies after the merge

This commit is contained in:
Matthew Jones
2013-11-08 10:04:12 -05:00
parent 2a16ab38a5
commit 2ab4cab495
3 changed files with 13 additions and 12 deletions

View File

@@ -346,7 +346,7 @@ class ActivityStream(models.Model):
('disaassociate', _("Entity was Disassociated with another Entity"))
]
user = models.ForeignKey('auth.User', null=True, on_delete=SET_NULL)
user = models.ForeignKey('auth.User', null=True, on_delete=models.SET_NULL)
operation = models.CharField(max_length=9, choices=OPERATION_CHOICES)
timestamp = models.DateTimeField(auto_now_add=True)
changes = models.TextField(blank=True)