klmp200/Sith
1
0
Fork 0
mirror of https://github.com/ae-utbm/sith.git synced 2025-07-09 19:40:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add is_in_sas field, to perform queries on it

Browse Source
This commit is contained in:
Skia
2016-11-22 14:58:39 +01:00
parent 5481a79f64
commit da35292cd5
5 changed files with 76 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
sas/models.py
View File

@ -14,11 +14,6 @@ class Picture(SithFile):
class Meta:
proxy = True
@property
def is_in_sas(self):
sas = SithFile.objects.filter(id=settings.SITH_SAS_ROOT_DIR_ID).first()
return sas in self.get_parent_list()
@property
def is_vertical(self):
im = Image.open(BytesIO(self.file.read()))
@ -79,11 +74,6 @@ class Album(SithFile):
class Meta:
proxy = True
@property
def is_in_sas(self):
sas = SithFile.objects.filter(id=settings.SITH_SAS_ROOT_DIR_ID).first()
return sas in self.get_parent_list()
def can_be_edited_by(self, user):
return user.is_in_group(settings.SITH_SAS_ADMIN_GROUP_ID)

4
sas/views.py
View File

@ -33,7 +33,7 @@ class SASForm(forms.Form):
album.save()
except Exception as e:
self.add_error(None, _("Error creating album %(album)s: %(msg)s") %
{'album': self.cleaned_data['album_name'], 'msg': str(e.message)})
{'album': self.cleaned_data['album_name'], 'msg': repr(e)})
for f in files:
new_file = Picture(parent=parent, name=f.name, file=f, owner=owner, mime_type=f.content_type, size=f._size,
is_folder=False, is_moderated=automodere)
@ -189,7 +189,7 @@ class ModerationView(TemplateView):
def get_context_data(self, **kwargs):
kwargs = super(ModerationView, self).get_context_data(**kwargs)
kwargs['pictures'] = [p for p in Picture.objects.filter(is_moderated=False).order_by('id') if p.is_in_sas]
kwargs['pictures'] = Picture.objects.filter(is_moderated=False, is_in_sas=True).order_by('id')
return kwargs