From fc110e4060ea656cb4a48d30d11532ca3c91b7d7 Mon Sep 17 00:00:00 2001 From: Yingtong Li Date: Sun, 31 Mar 2019 22:52:08 +1100 Subject: [PATCH] Add hidden bulletin groups --- sspromotions/models.py | 1 + sspromotions/views.py | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/sspromotions/models.py b/sspromotions/models.py index 75877d2..bdb6d20 100644 --- a/sspromotions/models.py +++ b/sspromotions/models.py @@ -26,6 +26,7 @@ class Group(models.Model): name = models.CharField(max_length=100) subscribable = models.BooleanField() order = models.IntegerField(null=True, blank=True) + hidden = models.BooleanField() managers = JSONField(default=[], blank=True) diff --git a/sspromotions/views.py b/sspromotions/views.py index 82d08a9..805509b 100644 --- a/sspromotions/views.py +++ b/sspromotions/views.py @@ -74,7 +74,7 @@ def bulletin_preview(request): else: date = timezone.now().date() date += datetime.timedelta(days=(6 - date.weekday() + 7) % 7) # Next Sunday (6 = Sunday) - return render(request, 'sspromotions/bulletin_preview.html', {'date': date, 'groups': models.Group.objects.all()}) + return render(request, 'sspromotions/bulletin_preview.html', {'date': date, 'groups': models.Group.objects.filter(hidden=False).all()}) @login_required def bulletin_new(request): @@ -102,7 +102,7 @@ def bulletin_new(request): item.date += datetime.timedelta(days=(6 - item.date.weekday() + 7) % 7) # Next Sunday (6 = Sunday) return render(request, 'sspromotions/bulletin_edit.html', { 'item': item, - 'groups': models.Group.objects.all() + 'groups': models.Group.objects.filter(hidden=False).all() }) @login_required @@ -131,7 +131,7 @@ def bulletin_edit(request, id): return HttpResponse('Unauthorized', status=401) return render(request, 'sspromotions/bulletin_edit.html', { 'item': item, - 'groups': models.Group.objects.all() + 'groups': models.Group.objects.filter(hidden=False).all() }) @login_required