diff --git a/beesgospel/admin.py b/beesgospel/admin.py index afcc0ed..35f08e5 100644 --- a/beesgospel/admin.py +++ b/beesgospel/admin.py @@ -14,8 +14,7 @@ class AgendaAdmin(admin.ModelAdmin): @admin.register(Document) class DocumentAdmin(admin.ModelAdmin): - list_display = ["titre", "quand", "categorie", "prive"] - list_filter = ["categorie"] + list_display = ["titre", "quand", "prive"] ordering = ["-quand"] diff --git a/beesgospel/migrations/0004_document_categorie.py b/beesgospel/migrations/0004_document_categorie.py deleted file mode 100644 index 0cdfb85..0000000 --- a/beesgospel/migrations/0004_document_categorie.py +++ /dev/null @@ -1,17 +0,0 @@ -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('beesgospel', '0003_membre_annee_entree_date_naissance'), - ] - - operations = [ - migrations.AddField( - model_name='document', - name='categorie', - field=models.CharField(choices=[('video', 'Vidéo'), ('audio', 'Audio'), ('photos', 'Photos'), ('doc', 'Document')], default='doc', max_length=30, verbose_name='Catégorie'), - preserve_default=False, - ), - ] diff --git a/beesgospel/models.py b/beesgospel/models.py index 83d63b1..b167719 100644 --- a/beesgospel/models.py +++ b/beesgospel/models.py @@ -63,18 +63,11 @@ class Agenda(models.Model): class Document(models.Model): - class Categories(models.TextChoices): - VIDEO = "video", "Vidéo" - AUDIO = "audio", "Audio" - PHOTOS = "photos", "Photos" - DOCUMENT = "doc", "Document" - fichier = models.FileField("Fichier", upload_to="documents", blank=True) url = models.URLField("URL", blank=True) quand = models.DateField("Date") titre = models.CharField("Titre", max_length=150) infos = models.TextField("Infos", blank=True) - categorie = models.CharField("Catégorie", max_length=30, choices=Categories) prive = models.BooleanField( "Privé", default=False, help_text=( "Un document privé ne peut être consulté que par les membres de " diff --git a/beesgospel/views.py b/beesgospel/views.py index a07b19d..5d6c2e4 100644 --- a/beesgospel/views.py +++ b/beesgospel/views.py @@ -45,19 +45,12 @@ class AgendaView(ListView): class MediaView(ListView): model = Document template_name = "media.html" - prive = False def get_queryset(self): - return Document.objects.filter(prive=self.prive).order_by("-quand", "titre") - - def get_context_data(self, **kwargs): - return { - **super().get_context_data(**kwargs), - "title": { - False: "Enregistrements, photos et vidéos de la chorale", - True: "Documents privés", - }.get(self.prive) - } + qs = Document.objects.all().order_by("-quand", "titre") + if not self.request.user.is_authenticated: + qs = qs.filter(prive=False) + return qs class EspaceMembresView(LoginRequiredMixin, TemplateView): diff --git a/common/urls.py b/common/urls.py index cdc5d82..e98c37f 100644 --- a/common/urls.py +++ b/common/urls.py @@ -11,9 +11,8 @@ urlpatterns = [ path("v2", TemplateView.as_view(template_name="index2.html"), name="home"), path("presentation/", views.PresentationView.as_view(), name="presentation"), path("contact/", TemplateView.as_view(template_name="contact.html"), name="contact"), - path("agenda/", views.AgendaView.as_view(), name="agenda"), - path("medias/", views.MediaView.as_view(prive=False), name="medias"), path("membres/", views.EspaceMembresView.as_view(), name="membres"), path("membres/liste/", views.ListeMembresView.as_view(), name="liste-membres"), - path("membres/documents/", views.MediaView.as_view(prive=True), name="docs-membres"), + path("agenda/", views.AgendaView.as_view(), name="agenda"), + path("medias/", views.MediaView.as_view(), name="medias"), ] diff --git a/templates/media.html b/templates/media.html index 7041a4b..4773eb1 100644 --- a/templates/media.html +++ b/templates/media.html @@ -3,7 +3,7 @@ {% block page_title %} - Media{% endblock %} {% block content %} -
Aucun document disponible pour le moment
{% endfor %} - -{% if perms.beesgospel.change_document %} - -{% endif %} {% endblock %} diff --git a/templates/membres/index.html b/templates/membres/index.html index 1d53109..65e3c25 100644 --- a/templates/membres/index.html +++ b/templates/membres/index.html @@ -7,9 +7,11 @@