cgiacofei/TandoorRecipes
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

avoid recursion in ingredient.__str__

Browse Source
This commit is contained in:
smilerz
2023-12-28 10:44:51 -06:00
parent 7ca5a34b28
commit cb63bb2615
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
cookbook/models.py
View File

@ -719,8 +719,7 @@ class Ingredient(ExportModelOperationsMixin('ingredient'), models.Model, Permiss
objects = ScopedManager(space='space') objects = ScopedManager(space='space')
def __str__(self): def __str__(self):
recipes = self.step_set.first().recipe_set.all() if self.step_set.exists() else None return f'{self.pk}: {self.amount} {self.food.name} {self.unit.name}'
return f'{recipes.first().name}: {self.pk}' if recipes else f'Orphaned Ingredient: {self.pk}'
class Meta: class Meta:
ordering = ['order', 'pk'] ordering = ['order', 'pk']
@ -749,6 +748,8 @@ class Step(ExportModelOperationsMixin('step'), models.Model, PermissionModelMixi
return render_instructions(self) return render_instructions(self)
def __str__(self): def __str__(self):
if not self.recipe_set.exists():
return f"{self.pk}: {_('Orphaned Step')}"
return f"{self.pk}: {self.name}" if self.name else f"Step: {self.pk}" return f"{self.pk}: {self.name}" if self.name else f"Step: {self.pk}"
class Meta: class Meta: