black + isort
This commit is contained in:
Lucie Galland
parent
6ba168d286
commit
0fbec31d14
10 changed files with 181 additions and 196 deletions
|
|
@ -6,22 +6,27 @@ app_name = "partitions"
|
|||
urlpatterns = [
|
||||
path("", views.Repertoire.as_view(), name="liste"),
|
||||
path("download", views.download_musecores, name="download_musecores"),
|
||||
path("<str:nom>/<str:auteur>/upload", views.Upload.as_view(),
|
||||
name="upload"),
|
||||
path("<str:nom>/<str:auteur>/upload", views.Upload.as_view(), name="upload"),
|
||||
path("<str:nom>/<str:auteur>", views.Morceau.as_view(), name="listepart"),
|
||||
path("<str:nom>/<str:auteur>/see/<int:partition_id>", views.see,
|
||||
name="see"),
|
||||
path("<str:nom>/<str:auteur>/<int:partition_id>", views.download,
|
||||
name="download"),
|
||||
path("<str:nom>/<str:auteur>/<int:id>/conf", views.ConfDelete.as_view(),
|
||||
name="conf_delete"),
|
||||
path("<str:nom>/<str:auteur>/<int:id>/delete", views.DeletePart.as_view(),
|
||||
name="delete"),
|
||||
path("<str:nom>/<str:auteur>/delete", views.DeleteMorc.as_view(),
|
||||
name="delete_morc"),
|
||||
path("<str:nom>/<str:auteur>/see/<int:partition_id>", views.see, name="see"),
|
||||
path("<str:nom>/<str:auteur>/<int:partition_id>", views.download, name="download"),
|
||||
path(
|
||||
"<str:nom>/<str:auteur>/conf", views.ConfDeleteMorc.as_view(),
|
||||
name="conf_delete_morc"
|
||||
"<str:nom>/<str:auteur>/<int:id>/conf",
|
||||
views.ConfDelete.as_view(),
|
||||
name="conf_delete",
|
||||
),
|
||||
path(
|
||||
"<str:nom>/<str:auteur>/<int:id>/delete",
|
||||
views.DeletePart.as_view(),
|
||||
name="delete",
|
||||
),
|
||||
path(
|
||||
"<str:nom>/<str:auteur>/delete", views.DeleteMorc.as_view(), name="delete_morc"
|
||||
),
|
||||
path(
|
||||
"<str:nom>/<str:auteur>/conf",
|
||||
views.ConfDeleteMorc.as_view(),
|
||||
name="conf_delete_morc",
|
||||
),
|
||||
path("new", views.CreateMorc.as_view(), name="ajouter_morceau"),
|
||||
]
|
||||
|
|
|
|||
|
|
@ -2,6 +2,7 @@ import io
|
|||
import os
|
||||
import zipfile
|
||||
|
||||
from django.contrib.auth.mixins import LoginRequiredMixin
|
||||
from django.core.files import File
|
||||
from django.db.models import Q
|
||||
from django.http import Http404
|
||||
|
|
@ -9,15 +10,14 @@ from django.shortcuts import HttpResponse, get_object_or_404, redirect, render
|
|||
from django.utils.safestring import mark_safe
|
||||
from django.utils.text import slugify
|
||||
from django.utils.translation import gettext_lazy as _
|
||||
from django.views.generic import TemplateView
|
||||
|
||||
from gestion.mixins import ChefRequiredMixin
|
||||
from gestion.models import Photo
|
||||
from partitions.forms import UploadFileForm, UploadMorceauForm
|
||||
from partitions.models import Category, Partition, PartitionSet
|
||||
from django.contrib.auth.mixins import LoginRequiredMixin
|
||||
from django.views.generic import TemplateView
|
||||
|
||||
from .forms import ChefEditMorceauForm
|
||||
from gestion.mixins import ChefRequiredMixin
|
||||
|
||||
|
||||
def download_musecores(request):
|
||||
|
|
@ -74,10 +74,10 @@ class Repertoire(TemplateView):
|
|||
|
||||
def get_context_data(self, **kwargs):
|
||||
context = super().get_context_data(**kwargs)
|
||||
context['categories'] = Category.objects.prefetch_related(
|
||||
"partitionset_set").order_by("order")
|
||||
context['photo'] = Photo.objects.filter(
|
||||
cat="part").order_by("?").first()
|
||||
context["categories"] = Category.objects.prefetch_related(
|
||||
"partitionset_set"
|
||||
).order_by("order")
|
||||
context["photo"] = Photo.objects.filter(cat="part").order_by("?").first()
|
||||
return context
|
||||
|
||||
|
||||
|
|
@ -87,8 +87,9 @@ class Morceau(LoginRequiredMixin, TemplateView):
|
|||
|
||||
def get_context_data(self, **kwargs):
|
||||
context = super(Morceau, self).get_context_data(**kwargs)
|
||||
p = get_object_or_404(PartitionSet, nom=self.kwargs['nom'],
|
||||
auteur=self.kwargs['auteur'])
|
||||
p = get_object_or_404(
|
||||
PartitionSet, nom=self.kwargs["nom"], auteur=self.kwargs["auteur"]
|
||||
)
|
||||
part = p.partition_set.all().order_by("nom")
|
||||
form = self.form_class(instance=p)
|
||||
infos = mark_safe(p.infos)
|
||||
|
|
@ -99,14 +100,15 @@ class Morceau(LoginRequiredMixin, TemplateView):
|
|||
context["infos_en"] = infos_en
|
||||
context["form"] = form
|
||||
context["part"] = part
|
||||
context["nom"] = self.kwargs['nom']
|
||||
context["auteur"] = self.kwargs['auteur']
|
||||
context["nom"] = self.kwargs["nom"]
|
||||
context["auteur"] = self.kwargs["auteur"]
|
||||
|
||||
return context
|
||||
|
||||
def post(self, request, *args, **kwargs):
|
||||
p = get_object_or_404(PartitionSet, nom=self.kwargs['nom'],
|
||||
auteur=self.kwargs['auteur'])
|
||||
p = get_object_or_404(
|
||||
PartitionSet, nom=self.kwargs["nom"], auteur=self.kwargs["auteur"]
|
||||
)
|
||||
if request.user.profile.is_chef:
|
||||
form = self.form_class(request.POST, instance=p)
|
||||
if form.is_valid():
|
||||
|
|
@ -126,8 +128,8 @@ class Upload(ChefRequiredMixin, TemplateView):
|
|||
form = self.form_class()
|
||||
|
||||
context["sauvegarde"] = self.sauvegarde
|
||||
context["nom"] = self.kwargs['nom']
|
||||
context["auteur"] = self.kwargs['auteur']
|
||||
context["nom"] = self.kwargs["nom"]
|
||||
context["auteur"] = self.kwargs["auteur"]
|
||||
context["form"] = form
|
||||
context["error"] = self.error
|
||||
return context
|
||||
|
|
@ -142,8 +144,9 @@ class Upload(ChefRequiredMixin, TemplateView):
|
|||
self.error = _("Le caractère / n'est pas autorisé dans le nom")
|
||||
context = self.get_context_data()
|
||||
return render(request, self.template_name, context)
|
||||
mor = get_object_or_404(PartitionSet, nom=self.kwargs['nom'],
|
||||
auteur=self.kwargs['auteur'])
|
||||
mor = get_object_or_404(
|
||||
PartitionSet, nom=self.kwargs["nom"], auteur=self.kwargs["auteur"]
|
||||
)
|
||||
partition.morceau = mor
|
||||
try:
|
||||
mor.partition_set.get(nom=partition.nom)
|
||||
|
|
@ -153,7 +156,7 @@ class Upload(ChefRequiredMixin, TemplateView):
|
|||
self.sauvegarde = True
|
||||
|
||||
context = self.get_context_data()
|
||||
context['form'] = form
|
||||
context["form"] = form
|
||||
return render(request, self.template_name, context)
|
||||
|
||||
|
||||
|
|
@ -197,15 +200,17 @@ class DeletePart(ChefRequiredMixin, TemplateView):
|
|||
model = PartitionSet
|
||||
|
||||
def get(self, request, *args, **kwargs):
|
||||
p = get_object_or_404(self.model, nom=self.kwargs['nom'],
|
||||
auteur=self.kwargs['auteur'])
|
||||
p = get_object_or_404(
|
||||
self.model, nom=self.kwargs["nom"], auteur=self.kwargs["auteur"]
|
||||
)
|
||||
try:
|
||||
part = p.partition_set.get(id=self.kwargs['id'])
|
||||
part = p.partition_set.get(id=self.kwargs["id"])
|
||||
except Partition.DoesNotExist:
|
||||
raise Http404
|
||||
part.delete()
|
||||
return redirect("partitions:listepart", nom=self.kwargs['nom'],
|
||||
auteur=self.kwargs['auteur'])
|
||||
return redirect(
|
||||
"partitions:listepart", nom=self.kwargs["nom"], auteur=self.kwargs["auteur"]
|
||||
)
|
||||
|
||||
|
||||
class CreateMorc(ChefRequiredMixin, TemplateView):
|
||||
|
|
@ -214,7 +219,7 @@ class CreateMorc(ChefRequiredMixin, TemplateView):
|
|||
|
||||
def get_context_data(self, **kwargs):
|
||||
context = super(CreateMorc, self).get_context_data(**kwargs)
|
||||
context['form'] = self.form_class()
|
||||
context["form"] = self.form_class()
|
||||
return context
|
||||
|
||||
def post(self, request, *args, **kwargs):
|
||||
|
|
@ -228,7 +233,7 @@ class CreateMorc(ChefRequiredMixin, TemplateView):
|
|||
if "/" in partitionset.auteur or "/" in partitionset.nom:
|
||||
error = _("Le caractère / n'est pas autorisé")
|
||||
context = self.get_context_data()
|
||||
context['error'] = error
|
||||
context["error"] = error
|
||||
return render(request, self.template_name, context)
|
||||
try:
|
||||
PartitionSet.objects.get(
|
||||
|
|
@ -247,9 +252,9 @@ class CreateMorc(ChefRequiredMixin, TemplateView):
|
|||
sauvegarde = True
|
||||
return redirect("partitions:liste")
|
||||
context = self.get_context_data()
|
||||
context['sauvegarde'] = sauvegarde
|
||||
context['error'] = error
|
||||
context['form'] = form
|
||||
context["sauvegarde"] = sauvegarde
|
||||
context["error"] = error
|
||||
context["form"] = form
|
||||
return render(request, self.template_name, context)
|
||||
|
||||
|
||||
|
|
@ -258,9 +263,9 @@ class ConfDelete(ChefRequiredMixin, TemplateView):
|
|||
|
||||
def get_context_data(self, **kwargs):
|
||||
context = super().get_context_data(**kwargs)
|
||||
context['nom'] = self.kwargs.get("nom")
|
||||
context['auteur'] = self.kwargs.get("auteur")
|
||||
context['id'] = self.kwargs.get("id")
|
||||
context["nom"] = self.kwargs.get("nom")
|
||||
context["auteur"] = self.kwargs.get("auteur")
|
||||
context["id"] = self.kwargs.get("id")
|
||||
return context
|
||||
|
||||
|
||||
|
|
@ -268,8 +273,9 @@ class DeleteMorc(ChefRequiredMixin, TemplateView):
|
|||
model = PartitionSet
|
||||
|
||||
def get(self, request, *args, **kwargs):
|
||||
p = get_object_or_404(self.model, nom=self.kwargs['nom'],
|
||||
auteur=self.kwargs['auteur'])
|
||||
p = get_object_or_404(
|
||||
self.model, nom=self.kwargs["nom"], auteur=self.kwargs["auteur"]
|
||||
)
|
||||
part = p.partition_set.all()
|
||||
for pa in part:
|
||||
pa.delete()
|
||||
|
|
@ -282,8 +288,8 @@ class ConfDeleteMorc(ChefRequiredMixin, TemplateView):
|
|||
|
||||
def get_context_data(self, **kwargs):
|
||||
context = super().get_context_data(**kwargs)
|
||||
context['nom'] = self.kwargs.get("nom")
|
||||
context['auteur'] = self.kwargs.get("auteur")
|
||||
context["nom"] = self.kwargs.get("nom")
|
||||
context["auteur"] = self.kwargs.get("auteur")
|
||||
return context
|
||||
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue