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

update __str__() on Step and Ingredient models

Browse Source
This commit is contained in:
smilerz 2023-12-20 15:55:02 -06:00
parent 7a5b744ff0
commit 26f694576a
No known key found for this signature in database
GPG Key ID: 39444C7606D47126
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
cookbook/models.py
View File

@ -718,6 +718,10 @@ class Ingredient(ExportModelOperationsMixin('ingredient'), models.Model, Permiss
space = models.ForeignKey(Space, on_delete=models.CASCADE) space = models.ForeignKey(Space, on_delete=models.CASCADE)
objects = ScopedManager(space='space') objects = ScopedManager(space='space')
def __str__(self):
recipes = self.step_set.first().recipe_set.all() if self.step_set.exists() else None
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']
indexes = ( indexes = (
@ -745,7 +749,9 @@ class Step(ExportModelOperationsMixin('step'), models.Model, PermissionModelMixi
return render_instructions(self) return render_instructions(self)
def __str__(self): def __str__(self):
return f'{self.pk} {self.name}' if not self.recipe_set.exists():
return f"Orphaned Step{'':s if not obj.name else f': {self.pk} {self.name}'}"
return f"{self.recipe_set.first().name}: {self.name}" if self.name else self.recipe_set.first().name
class Meta: class Meta:
ordering = ['order', 'pk'] ordering = ['order', 'pk']