klmp200/Sith
1
0
Fork 0
mirror of https://github.com/ae-utbm/sith3.git synced 2024-06-18 12:41:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'new_django' into 'master'

Browse Source 
Fix user pictures display

See merge request ae/Sith!152
This commit is contained in:
Antoine Bartuccio 2018-06-10 18:49:44 +02:00
commit 7322882002
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
core/views/user.py
View File

@ -254,7 +254,7 @@ class UserPicturesView(UserTabsMixin, CanViewMixin, DetailView):
kwargs = super(UserPicturesView, self).get_context_data(**kwargs) kwargs = super(UserPicturesView, self).get_context_data(**kwargs)
kwargs['albums'] = [] kwargs['albums'] = []
kwargs['pictures'] = {} 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 last_album = None
for pict_relation in picture_qs: for pict_relation in picture_qs:
album = pict_relation.picture.parent album = pict_relation.picture.parent
@ -262,10 +262,10 @@ class UserPicturesView(UserTabsMixin, CanViewMixin, DetailView):
kwargs['albums'].append(album) kwargs['albums'].append(album)
kwargs['pictures'][album.id] = [] kwargs['pictures'][album.id] = []
last_album = album.id last_album = album.id
print(album, album.date)
kwargs['pictures'][album.id].append(pict_relation.picture) kwargs['pictures'][album.id].append(pict_relation.picture)
return kwargs return kwargs
def DeleteUserGodfathers(request, user_id, godfather_id, is_father): def DeleteUserGodfathers(request, user_id, godfather_id, is_father):
user = User.objects.get(id=user_id) user = User.objects.get(id=user_id)
if ((user == request.user) or if ((user == request.user) or
@ -280,6 +280,7 @@ def DeleteUserGodfathers(request, user_id, godfather_id, is_father):
raise PermissionDenied raise PermissionDenied
return redirect('core:user_godfathers', user_id=user_id) return redirect('core:user_godfathers', user_id=user_id)
class UserGodfathersView(UserTabsMixin, CanViewMixin, DetailView): class UserGodfathersView(UserTabsMixin, CanViewMixin, DetailView):
""" """
Display a user's godfathers Display a user's godfathers

9
sas/models.py
View File

@ -35,15 +35,18 @@ import os
from core.models import SithFile, User from core.models import SithFile, User
from core.utils import resize_image, exif_auto_rotate from core.utils import resize_image, exif_auto_rotate
class SASPictureManager(models.Manager): class SASPictureManager(models.Manager):
def get_queryset(self): def get_queryset(self):
return super(SASPictureManager, self).get_queryset().filter(is_in_sas=True, return super(SASPictureManager, self).get_queryset().filter(is_in_sas=True,
is_folder=False) is_folder=False)
class SASAlbumManager(models.Manager): class SASAlbumManager(models.Manager):
def get_queryset(self): def get_queryset(self):
return super(SASAlbumManager, self).get_queryset().filter(is_in_sas=True, return super(SASAlbumManager, self).get_queryset().filter(is_in_sas=True,
is_folder=True) is_folder=True)
class Picture(SithFile): class Picture(SithFile):
class Meta: class Meta:
@ -163,6 +166,7 @@ class Album(SithFile):
self.file.name = self.name + '/thumb.jpg' self.file.name = self.name + '/thumb.jpg'
self.save() self.save()
def sas_notification_callback(notif): def sas_notification_callback(notif):
count = Picture.objects.filter(is_moderated=False).count() count = Picture.objects.filter(is_moderated=False).count()
if count: if count:
@ -172,6 +176,7 @@ def sas_notification_callback(notif):
notif.param = "%s" % count notif.param = "%s" % count
notif.date = timezone.now() notif.date = timezone.now()
class PeoplePictureRelation(models.Model): class PeoplePictureRelation(models.Model):
""" """
The PeoplePictureRelation class makes the connection between User and Picture The PeoplePictureRelation class makes the connection between User and Picture