fixed to space delete
This commit is contained in:
parent
3fd3c8ec12
commit
ce32c20f67
@ -320,10 +320,18 @@ class Space(ExportModelOperationsMixin('space'), models.Model):
|
|||||||
BookmarkletImport.objects.filter(space=self).delete()
|
BookmarkletImport.objects.filter(space=self).delete()
|
||||||
CustomFilter.objects.filter(space=self).delete()
|
CustomFilter.objects.filter(space=self).delete()
|
||||||
|
|
||||||
|
Property.objects.filter(space=self).delete()
|
||||||
|
PropertyType.objects.filter(space=self).delete()
|
||||||
|
|
||||||
Comment.objects.filter(recipe__space=self).delete()
|
Comment.objects.filter(recipe__space=self).delete()
|
||||||
Keyword.objects.filter(space=self).delete()
|
|
||||||
Ingredient.objects.filter(space=self).delete()
|
Ingredient.objects.filter(space=self).delete()
|
||||||
Food.objects.filter(space=self).delete()
|
Keyword.objects.filter(space=self).delete()
|
||||||
|
|
||||||
|
# delete food in batches because treabeard might fail to delete otherwise
|
||||||
|
while Food.objects.filter(space=self).count() > 0:
|
||||||
|
pks = Food.objects.filter(space=self).values_list('pk')[:200]
|
||||||
|
Food.objects.filter(pk__in=pks).delete()
|
||||||
|
|
||||||
Unit.objects.filter(space=self).delete()
|
Unit.objects.filter(space=self).delete()
|
||||||
Step.objects.filter(space=self).delete()
|
Step.objects.filter(space=self).delete()
|
||||||
NutritionInformation.objects.filter(space=self).delete()
|
NutritionInformation.objects.filter(space=self).delete()
|
||||||
@ -347,9 +355,11 @@ class Space(ExportModelOperationsMixin('space'), models.Model):
|
|||||||
SupermarketCategory.objects.filter(space=self).delete()
|
SupermarketCategory.objects.filter(space=self).delete()
|
||||||
Supermarket.objects.filter(space=self).delete()
|
Supermarket.objects.filter(space=self).delete()
|
||||||
|
|
||||||
InviteLink.objects.filter(space=self).delete()
|
|
||||||
UserFile.objects.filter(space=self).delete()
|
UserFile.objects.filter(space=self).delete()
|
||||||
|
UserSpace.objects.filter(space=self).delete()
|
||||||
Automation.objects.filter(space=self).delete()
|
Automation.objects.filter(space=self).delete()
|
||||||
|
InviteLink.objects.filter(space=self).delete()
|
||||||
|
TelegramBot.objects.filter(space=self).delete()
|
||||||
self.delete()
|
self.delete()
|
||||||
|
|
||||||
def get_owner(self):
|
def get_owner(self):
|
||||||
@ -442,6 +452,7 @@ class UserPreference(models.Model, PermissionModelMixin):
|
|||||||
self.use_fractions = FRACTION_PREF_DEFAULT
|
self.use_fractions = FRACTION_PREF_DEFAULT
|
||||||
|
|
||||||
return super().save(*args, **kwargs)
|
return super().save(*args, **kwargs)
|
||||||
|
|
||||||
def __str__(self):
|
def __str__(self):
|
||||||
return str(self.user)
|
return str(self.user)
|
||||||
|
|
||||||
@ -985,7 +996,6 @@ class RecipeBook(ExportModelOperationsMixin('book'), models.Model, PermissionMod
|
|||||||
filter = models.ForeignKey('cookbook.CustomFilter', null=True, blank=True, on_delete=models.SET_NULL)
|
filter = models.ForeignKey('cookbook.CustomFilter', null=True, blank=True, on_delete=models.SET_NULL)
|
||||||
order = models.IntegerField(default=0)
|
order = models.IntegerField(default=0)
|
||||||
|
|
||||||
|
|
||||||
space = models.ForeignKey(Space, on_delete=models.CASCADE)
|
space = models.ForeignKey(Space, on_delete=models.CASCADE)
|
||||||
objects = ScopedManager(space='space')
|
objects = ScopedManager(space='space')
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user