klmp200/Sith
1
0
Fork 0
mirror of https://github.com/ae-utbm/sith.git synced 2024-11-25 02:24:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

sas: update models managers

Browse Source 
Signed-off-by: Skia <skia@libskia.so>
This commit is contained in:
Skia 2017-09-25 12:34:05 +02:00
parent 3a16c7aab4
commit 469304585c
2 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
sas/models.py
View File

@ -34,11 +34,22 @@ 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):
def get_queryset(self):
return super(SASPictureManager, self).get_queryset().filter(is_in_sas=True,
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)
class Picture(SithFile): class Picture(SithFile):
class Meta: class Meta:
proxy = True proxy = True
objects = SASPictureManager()
@property @property
def is_vertical(self): def is_vertical(self):
with open(os.path.join(settings.MEDIA_ROOT, self.file.name).encode('utf-8'), 'rb') as f: with open(os.path.join(settings.MEDIA_ROOT, self.file.name).encode('utf-8'), 'rb') as f:
@ -104,27 +115,29 @@ class Picture(SithFile):
return self.parent.children.filter(is_moderated=True, asked_for_removal=False, is_folder=False, return self.parent.children.filter(is_moderated=True, asked_for_removal=False, is_folder=False,
id__gt=self.id).order_by('id').first() id__gt=self.id).order_by('id').first()
else: else:
return Picture.objects.filter(id__gt=self.id, is_moderated=False, is_in_sas=True).order_by('id').first() return Picture.objects.filter(id__gt=self.id, is_moderated=False).order_by('id').first()
def get_previous(self): def get_previous(self):
if self.is_moderated: if self.is_moderated:
return self.parent.children.filter(is_moderated=True, asked_for_removal=False, is_folder=False, return self.parent.children.filter(is_moderated=True, asked_for_removal=False, is_folder=False,
id__lt=self.id).order_by('id').last() id__lt=self.id).order_by('id').last()
else: else:
return Picture.objects.filter(id__lt=self.id, is_moderated=False, is_in_sas=True).order_by('-id').first() return Picture.objects.filter(id__lt=self.id, is_moderated=False).order_by('-id').first()
class Album(SithFile): class Album(SithFile):
class Meta: class Meta:
proxy = True proxy = True
objects = SASAlbumManager()
@property @property
def children_pictures(self): def children_pictures(self):
return Picture.objects.filter(parent=self, is_folder=False) return Picture.objects.filter(parent=self)
@property @property
def children_albums(self): def children_albums(self):
return Album.objects.filter(parent=self, is_folder=True) return Album.objects.filter(parent=self)
def can_be_edited_by(self, user): def can_be_edited_by(self, user):
# file = SithFile.objects.filter(id=self.id).first() # file = SithFile.objects.filter(id=self.id).first()

2
sas/templates/sas/main.jinja
View File

@ -10,7 +10,7 @@
<div class="album"> <div class="album">
<div> <div>
{% if a.file %} {% if a.file %}
<img src="{{ a.as_picture.get_download_url() }}" alt="{% trans %}preview{% endtrans %}"> <img src="{{ a.get_download_url() }}" alt="{% trans %}preview{% endtrans %}">
{% elif a.children.filter(is_folder=False, is_moderated=True).exists() %} {% elif a.children.filter(is_folder=False, is_moderated=True).exists() %}
<img src="{{ a.children.filter(is_folder=False).first().as_picture.get_download_thumb_url() }}" alt="{% trans %}preview{% endtrans %}"> <img src="{{ a.children.filter(is_folder=False).first().as_picture.get_download_thumb_url() }}" alt="{% trans %}preview{% endtrans %}">
{% else %} {% else %}