Commit 5c4a16d1 authored by Sli's avatar Sli

Fix user pictures display

parent 08de5dfe
Pipeline #1505 passed with stage
in 5 minutes and 56 seconds
......@@ -254,7 +254,7 @@ class UserPicturesView(UserTabsMixin, CanViewMixin, DetailView):
kwargs = super(UserPicturesView, self).get_context_data(**kwargs)
kwargs['albums'] = []
kwargs['pictures'] = {}
picture_qs = self.object.pictures.exclude(picture=None).order_by('-picture__parent__date', 'id').select_related('picture__parent__name')
picture_qs = self.object.pictures.exclude(picture=None).order_by('-picture__parent__date', 'id').select_related('picture__parent')
last_album = None
for pict_relation in picture_qs:
album = pict_relation.picture.parent
......@@ -262,10 +262,10 @@ class UserPicturesView(UserTabsMixin, CanViewMixin, DetailView):
kwargs['albums'].append(album)
kwargs['pictures'][album.id] = []
last_album = album.id
print(album, album.date)
kwargs['pictures'][album.id].append(pict_relation.picture)
return kwargs
def DeleteUserGodfathers(request, user_id, godfather_id, is_father):
user = User.objects.get(id=user_id)
if ((user == request.user) or
......@@ -280,6 +280,7 @@ def DeleteUserGodfathers(request, user_id, godfather_id, is_father):
raise PermissionDenied
return redirect('core:user_godfathers', user_id=user_id)
class UserGodfathersView(UserTabsMixin, CanViewMixin, DetailView):
"""
Display a user's godfathers
......
......@@ -35,15 +35,18 @@ import os
from core.models import SithFile, User
from core.utils import resize_image, exif_auto_rotate
class SASPictureManager(models.Manager):
def get_queryset(self):
return super(SASPictureManager, self).get_queryset().filter(is_in_sas=True,
is_folder=False)
is_folder=False)
class SASAlbumManager(models.Manager):
def get_queryset(self):
return super(SASAlbumManager, self).get_queryset().filter(is_in_sas=True,
is_folder=True)
is_folder=True)
class Picture(SithFile):
class Meta:
......@@ -163,6 +166,7 @@ class Album(SithFile):
self.file.name = self.name + '/thumb.jpg'
self.save()
def sas_notification_callback(notif):
count = Picture.objects.filter(is_moderated=False).count()
if count:
......@@ -172,6 +176,7 @@ def sas_notification_callback(notif):
notif.param = "%s" % count
notif.date = timezone.now()
class PeoplePictureRelation(models.Model):
"""
The PeoplePictureRelation class makes the connection between User and Picture
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment