X-Git-Url: https://git.mdrn.pl/wolnelektury.git/blobdiff_plain/af8a54f4fbb7956ffbdb4e7b2aaddd7659de4f57..572ee91a188114e383712eac2426dab3bcef6c00:/src/social/models.py diff --git a/src/social/models.py b/src/social/models.py index 862db4cdd..89fa65cd8 100644 --- a/src/social/models.py +++ b/src/social/models.py @@ -277,6 +277,11 @@ class Progress(Syncable, models.Model): return super().save(*args, **kwargs) +class ActiveManager(models.Manager): + def get_queryset(self): + return super().get_queryset().filter(deleted=False) + + class UserList(Syncable, models.Model): slug = models.SlugField(unique=True) user = models.ForeignKey(User, models.CASCADE) @@ -289,7 +294,10 @@ class UserList(Syncable, models.Model): reported_timestamp = models.DateTimeField() syncable_fields = ['name', 'public', 'deleted'] - + + objects = ActiveManager() + all_objects = models.Manager() + def get_absolute_url(self): return reverse( 'tagged_object_list', @@ -351,7 +359,7 @@ class UserList(Syncable, models.Model): # merge? lists = list(cls.objects.filter(user=user, favorites=True)) for l in lists[1:]: - t.userlistitem_set.all().update( + l.userlistitem_set.all().update( list=lists[0] ) l.delete()