diff --git a/inventory/models/item.py b/inventory/models/item.py index 96d1bf8..5d4029f 100644 --- a/inventory/models/item.py +++ b/inventory/models/item.py @@ -28,7 +28,10 @@ class Item(CanBeContained): @property def all_tags(self): - return list(self.tags.all()) + list(self.form_factor.tags.all()) - + if self.form_factor: + return list(self.tags.all()) + list(self.form_factor.tags.all()) + else: + return list(self.tags.all()) + class Meta: ordering = ("name", )