flake8 formating
This commit is contained in:
parent
4f877dd2f2
commit
1492c803a8
5 changed files with 18 additions and 20 deletions
|
|
@ -59,4 +59,4 @@ class TagAdmin(admin.ModelAdmin):
|
|||
|
||||
admin.site.register(Gallery, GalleryAdmin)
|
||||
admin.site.register(Photo, PhotoAdmin)
|
||||
admin.site.register(Tag, TagAdmin)
|
||||
admin.site.register(Tag, TagAdmin)
|
||||
|
|
|
|||
|
|
@ -186,15 +186,15 @@ class Gallery(models.Model):
|
|||
def sample(self, public=True):
|
||||
"""Return a sample of photos, ordered at random."""
|
||||
count = 1
|
||||
nb = self.photo_count(public) #Optimisation don't do twice the SQL requests
|
||||
nb = self.photo_count(public) # Optimisation don't do twice the SQL requests
|
||||
if nb < count:
|
||||
count = nb
|
||||
|
||||
|
||||
if public:
|
||||
photo_set = self.photos.filter(is_public=True)
|
||||
else:
|
||||
photo_set = self.photos
|
||||
return photo_set.order_by("?")[:count] # Use native SQL random
|
||||
return photo_set.order_by("?")[:count] # Use native SQL random
|
||||
|
||||
def photo_count(self, public=True):
|
||||
"""Return a count of all the photos in this gallery."""
|
||||
|
|
@ -726,14 +726,14 @@ class PhotoSizeCache:
|
|||
def __init__(self):
|
||||
self.__dict__ = self.__state
|
||||
|
||||
cached = caches.get("PhotoSizeCache",None)
|
||||
if cached is None :
|
||||
cached = caches.get("PhotoSizeCache", None)
|
||||
if cached is None:
|
||||
if not len(self.sizes):
|
||||
sizes = PhotoSize.objects.all()
|
||||
for size in sizes:
|
||||
self.sizes[size.name] = size
|
||||
caches.set("PhotoSizeCache",self)
|
||||
else :
|
||||
caches.set("PhotoSizeCache", self)
|
||||
else:
|
||||
self = cached
|
||||
|
||||
def reset(self):
|
||||
|
|
|
|||
|
|
@ -23,7 +23,6 @@ from PIL import Image
|
|||
from django.contrib.auth import get_user_model
|
||||
|
||||
|
||||
|
||||
from .forms import UploadForm
|
||||
from .models import Gallery, Photo, Tag
|
||||
|
||||
|
|
@ -143,23 +142,22 @@ class GalleryDetailView(LoginRequiredMixin, DetailView):
|
|||
|
||||
# Non-staff members only see public photos + prefetch all owners informations (Optimisation)
|
||||
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:
|
||||
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
|
||||
context["owners"] = []
|
||||
|
||||
#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)
|
||||
|
||||
|
||||
# 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)
|
||||
|
||||
for photo in context["photos"]:
|
||||
if photo.owner not in context["owners"]:
|
||||
context["owners"].append(photo.owner)
|
||||
|
||||
|
||||
|
||||
# Filter on owner
|
||||
if "owner" in self.kwargs:
|
||||
context["photos"] = context["photos"].filter(owner__id=self.kwargs["owner"])
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue