From 97ba69540c9d913f340c7cf389088167d7b45407 Mon Sep 17 00:00:00 2001 From: Étienne Loks Date: Wed, 17 Feb 2021 12:32:51 +0100 Subject: Template gen: fix typo in file attributes --- archaeological_files/models.py | 2 +- ishtar_common/models.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/archaeological_files/models.py b/archaeological_files/models.py index 6478dfeaa..b897911eb 100644 --- a/archaeological_files/models.py +++ b/archaeological_files/models.py @@ -372,7 +372,7 @@ class File(ClosedItem, DocumentItem, BaseHistorizedItem, CompleteIdentifierItem, imported_line = models.TextField(_("Imported line"), blank=True, default="") history = HistoricalRecords(bases=[HistoryModel]) - GET_VALUES_EXTRA = ValueGetter.GET_VALUES_EXCLUDE_FIELDS + [ + GET_VALUES_EXTRA = ValueGetter.GET_VALUES_EXTRA + [ 'general_contractor_address_1', 'general_contractor_address_2', 'general_contractor_address_3', diff --git a/ishtar_common/models.py b/ishtar_common/models.py index 2df42bc05..8e65c4503 100644 --- a/ishtar_common/models.py +++ b/ishtar_common/models.py @@ -1562,10 +1562,10 @@ class DocumentTemplate(models.Model): dct = {} dct['available'] = True if empty_first: - yield ('', '----------') + yield '', '----------' items = cls.objects.filter(**dct) for item in items.distinct().order_by(*cls._meta.ordering).all(): - yield (item.pk, _(str(item))) + yield item.pk, _(str(item)) def get_baselink_for_labels(self): return reverse('generate-labels', args=[self.slug]) -- cgit v1.2.3