From 219363acbb46eb7456f88ba9df9e23bc02b6675c Mon Sep 17 00:00:00 2001 From: Jonas Legion Date: Wed, 22 Dec 2021 10:45:51 +0400 Subject: [PATCH] choices templates --- DjangoFiles/BaseBillet/models.py | 15 +++++++++++++-- DjangoFiles/BaseBillet/views.py | 6 +----- 2 files changed, 14 insertions(+), 7 deletions(-) diff --git a/DjangoFiles/BaseBillet/models.py b/DjangoFiles/BaseBillet/models.py index 4912813..336cd29 100644 --- a/DjangoFiles/BaseBillet/models.py +++ b/DjangoFiles/BaseBillet/models.py @@ -158,8 +158,18 @@ class Configuration(SingletonModel): verbose_name=_("Clé d'API du serveur cashless") ) + ARNAUD, MASSIVELY, BLK_MVC, BLK_VUE = 'arnaud_mvc', 'html5up-masseively', 'blk_mvc', 'blk_vue' + CHOICE_TEMPLATE = [ + (ARNAUD, _('arnaud_mvc')), + (MASSIVELY, _("html5up-masseively")), + (BLK_MVC, _("blk_mvc")), + (BLK_VUE, _("blk_vue")), + ] + # choices=[(folder, folder) for folder in os.listdir(f"{settings.BASE_DIR}/BaseBillet/templates")], + template_billetterie = models.CharField( - choices=[(folder, folder) for folder in os.listdir(f"{settings.BASE_DIR}/BaseBillet/templates")], + choices=CHOICE_TEMPLATE, + default=ARNAUD, max_length=250, blank=True, null=True, @@ -167,7 +177,8 @@ class Configuration(SingletonModel): ) template_meta = models.CharField( - choices=[(folder, folder) for folder in os.listdir(f"{settings.BASE_DIR}/MetaBillet/templates")], + choices=CHOICE_TEMPLATE, + default=MASSIVELY, max_length=250, blank=True, null=True, diff --git a/DjangoFiles/BaseBillet/views.py b/DjangoFiles/BaseBillet/views.py index 6f549a4..4cba032 100644 --- a/DjangoFiles/BaseBillet/views.py +++ b/DjangoFiles/BaseBillet/views.py @@ -24,14 +24,10 @@ class index(APIView): if not configuration.activer_billetterie: return HttpResponseRedirect('https://www.tibillet.re') - first_event = None - events = Event.objects.filter(datetime__gt=datetime.now()) - if len(events) > 0: - first_event = events[0] context = { 'configuration': configuration, - 'events': events, + 'events': Event.objects.filter(datetime__gt=datetime.now()), 'categorie_billet': Product.BILLET, }