sinfonie/photo26
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

flake8 formating

Browse source
This commit is contained in:
loulous27 2025-11-28 20:59:42 +01:00
parent 4f877dd2f2
commit 1492c803a8
5 changed files with 18 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

2
photo21/urls.py
View file

@ -24,7 +24,7 @@ urlpatterns = [
path("", include("photologue.urls", namespace="photologue")), path("", include("photologue.urls", namespace="photologue")),
path("accounts/", include("allauth.urls")), path("accounts/", include("allauth.urls")),
path("i18n/", include("django.conf.urls.i18n")), path("i18n/", include("django.conf.urls.i18n")),
path('jsi18n/', JavaScriptCatalog.as_view(), name='javascript-catalog'), path("jsi18n/", JavaScriptCatalog.as_view(), name="javascript-catalog"),
path("admin/doc/", include("django.contrib.admindocs.urls")), path("admin/doc/", include("django.contrib.admindocs.urls")),
path("admin/", admin.site.urls), path("admin/", admin.site.urls),
] ]

10
photologue/views.py
View file

@ -23,7 +23,6 @@ from PIL import Image
from django.contrib.auth import get_user_model from django.contrib.auth import get_user_model
from .forms import UploadForm from .forms import UploadForm
from .models import Gallery, Photo, Tag from .models import Gallery, Photo, Tag
@ -143,9 +142,11 @@ class GalleryDetailView(LoginRequiredMixin, DetailView):
# Non-staff members only see public photos + prefetch all owners informations (Optimisation) # Non-staff members only see public photos + prefetch all owners informations (Optimisation)
if self.request.user.is_staff: if self.request.user.is_staff:
context["photos"] = self.object.photos.all().select_related('owner') context["photos"] = self.object.photos.all().select_related("owner")
else: else:
context["photos"] = self.object.photos.filter(is_public=True).select_related('owner') context["photos"] = self.object.photos.filter(
is_public=True
).select_related("owner")
# List owners # List owners
context["owners"] = [] context["owners"] = []
@ -153,13 +154,10 @@ class GalleryDetailView(LoginRequiredMixin, DetailView):
# owners_pk_distinct = context["photos"].order_by('owner__pk').values_list('owner__pk', flat=True).distinct() # owners_pk_distinct = context["photos"].order_by('owner__pk').values_list('owner__pk', flat=True).distinct()
# context["owners"] = User.objects.filter(pk__in=owners_pk_distinct) # context["owners"] = User.objects.filter(pk__in=owners_pk_distinct)
for photo in context["photos"]: for photo in context["photos"]:
if photo.owner not in context["owners"]: if photo.owner not in context["owners"]:
context["owners"].append(photo.owner) context["owners"].append(photo.owner)
# Filter on owner # Filter on owner
if "owner" in self.kwargs: if "owner" in self.kwargs:
context["photos"] = context["photos"].filter(owner__id=self.kwargs["owner"]) context["photos"] = context["photos"].filter(owner__id=self.kwargs["owner"])