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

Merge branch 'develop' into feature/unit-conversion

Browse Source
This commit is contained in:
vabene1111
2023-03-15 14:57:00 +01:00
parent b10be8d321 d5ca8e9c96
commit 27c5749b21
23 changed files with 384 additions and 272 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cookbook/models.py
View File

@ -700,7 +700,7 @@ class Ingredient(ExportModelOperationsMixin('ingredient'), models.Model, Permiss
if self.always_use_plural_unit and self.unit.plural_name not in (None, "") and not self.no_amount:
unit = self.unit.plural_name
else:
if self.amount > 1 and self.unit.plural_name not in (None, "") and not self.no_amount:
if self.amount > 1 and self.unit is not None and self.unit.plural_name not in (None, "") and not self.no_amount:
unit = self.unit.plural_name
else:
unit = str(self.unit)