mirror of
https://github.com/ae-utbm/sith.git
synced 2025-07-09 19:40:19 +00:00
All: Apply Black coding rules
This commit is contained in:
@ -21,4 +21,3 @@
|
||||
# Place - Suite 330, Boston, MA 02111-1307, USA.
|
||||
#
|
||||
#
|
||||
|
||||
|
@ -6,27 +6,13 @@ from django.db import migrations, models
|
||||
|
||||
class Migration(migrations.Migration):
|
||||
|
||||
dependencies = [
|
||||
('core', '0006_auto_20161108_1703'),
|
||||
]
|
||||
dependencies = [("core", "0006_auto_20161108_1703")]
|
||||
|
||||
operations = [
|
||||
migrations.CreateModel(
|
||||
name='Album',
|
||||
fields=[
|
||||
],
|
||||
options={
|
||||
'proxy': True,
|
||||
},
|
||||
bases=('core.sithfile',),
|
||||
name="Album", fields=[], options={"proxy": True}, bases=("core.sithfile",)
|
||||
),
|
||||
migrations.CreateModel(
|
||||
name='Picture',
|
||||
fields=[
|
||||
],
|
||||
options={
|
||||
'proxy': True,
|
||||
},
|
||||
bases=('core.sithfile',),
|
||||
name="Picture", fields=[], options={"proxy": True}, bases=("core.sithfile",)
|
||||
),
|
||||
]
|
||||
|
@ -9,20 +9,39 @@ class Migration(migrations.Migration):
|
||||
|
||||
dependencies = [
|
||||
migrations.swappable_dependency(settings.AUTH_USER_MODEL),
|
||||
('sas', '0001_initial'),
|
||||
("sas", "0001_initial"),
|
||||
]
|
||||
|
||||
operations = [
|
||||
migrations.CreateModel(
|
||||
name='PeoplePictureRelation',
|
||||
name="PeoplePictureRelation",
|
||||
fields=[
|
||||
('id', models.AutoField(primary_key=True, verbose_name='ID', auto_created=True, serialize=False)),
|
||||
('picture', models.ForeignKey(related_name='people', to='sas.Picture', verbose_name='picture')),
|
||||
('user', models.ForeignKey(related_name='pictures', to=settings.AUTH_USER_MODEL, verbose_name='user')),
|
||||
(
|
||||
"id",
|
||||
models.AutoField(
|
||||
primary_key=True,
|
||||
verbose_name="ID",
|
||||
auto_created=True,
|
||||
serialize=False,
|
||||
),
|
||||
),
|
||||
(
|
||||
"picture",
|
||||
models.ForeignKey(
|
||||
related_name="people", to="sas.Picture", verbose_name="picture"
|
||||
),
|
||||
),
|
||||
(
|
||||
"user",
|
||||
models.ForeignKey(
|
||||
related_name="pictures",
|
||||
to=settings.AUTH_USER_MODEL,
|
||||
verbose_name="user",
|
||||
),
|
||||
),
|
||||
],
|
||||
),
|
||||
migrations.AlterUniqueTogether(
|
||||
name='peoplepicturerelation',
|
||||
unique_together=set([('user', 'picture')]),
|
||||
name="peoplepicturerelation", unique_together=set([("user", "picture")])
|
||||
),
|
||||
]
|
||||
|
129
sas/models.py
129
sas/models.py
@ -38,14 +38,20 @@ 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)
|
||||
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)
|
||||
return (
|
||||
super(SASAlbumManager, self)
|
||||
.get_queryset()
|
||||
.filter(is_in_sas=True, is_folder=True)
|
||||
)
|
||||
|
||||
|
||||
class Picture(SithFile):
|
||||
@ -56,7 +62,9 @@ class Picture(SithFile):
|
||||
|
||||
@property
|
||||
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:
|
||||
im = Image.open(BytesIO(f.read()))
|
||||
(w, h) = im.size
|
||||
return (w / h) < 1
|
||||
@ -64,24 +72,27 @@ class Picture(SithFile):
|
||||
|
||||
def can_be_edited_by(self, user):
|
||||
# file = SithFile.objects.filter(id=self.id).first()
|
||||
return user.is_in_group(settings.SITH_GROUP_SAS_ADMIN_ID) # or user.can_edit(file)
|
||||
return user.is_in_group(
|
||||
settings.SITH_GROUP_SAS_ADMIN_ID
|
||||
) # or user.can_edit(file)
|
||||
|
||||
def can_be_viewed_by(self, user):
|
||||
# file = SithFile.objects.filter(id=self.id).first()
|
||||
return self.can_be_edited_by(user) or (self.is_in_sas and self.is_moderated and
|
||||
user.was_subscribed) # or user.can_view(file)
|
||||
return self.can_be_edited_by(user) or (
|
||||
self.is_in_sas and self.is_moderated and user.was_subscribed
|
||||
) # or user.can_view(file)
|
||||
|
||||
def get_download_url(self):
|
||||
return reverse('sas:download', kwargs={'picture_id': self.id})
|
||||
return reverse("sas:download", kwargs={"picture_id": self.id})
|
||||
|
||||
def get_download_compressed_url(self):
|
||||
return reverse('sas:download_compressed', kwargs={'picture_id': self.id})
|
||||
return reverse("sas:download_compressed", kwargs={"picture_id": self.id})
|
||||
|
||||
def get_download_thumb_url(self):
|
||||
return reverse('sas:download_thumb', kwargs={'picture_id': self.id})
|
||||
return reverse("sas:download_thumb", kwargs={"picture_id": self.id})
|
||||
|
||||
def get_absolute_url(self):
|
||||
return reverse('sas:picture', kwargs={'picture_id': self.id})
|
||||
return reverse("sas:picture", kwargs={"picture_id": self.id})
|
||||
|
||||
def generate_thumbnails(self, overwrite=False):
|
||||
im = Image.open(BytesIO(self.file.read()))
|
||||
@ -89,9 +100,9 @@ class Picture(SithFile):
|
||||
im = exif_auto_rotate(im)
|
||||
except:
|
||||
pass
|
||||
file = resize_image(im, max(im.size), self.mime_type.split('/')[-1])
|
||||
thumb = resize_image(im, 200, self.mime_type.split('/')[-1])
|
||||
compressed = resize_image(im, 1200, self.mime_type.split('/')[-1])
|
||||
file = resize_image(im, max(im.size), self.mime_type.split("/")[-1])
|
||||
thumb = resize_image(im, 200, self.mime_type.split("/")[-1])
|
||||
compressed = resize_image(im, 1200, self.mime_type.split("/")[-1])
|
||||
if overwrite:
|
||||
self.file.delete()
|
||||
self.thumbnail.delete()
|
||||
@ -105,28 +116,60 @@ class Picture(SithFile):
|
||||
self.save()
|
||||
|
||||
def rotate(self, degree):
|
||||
for attr in ['file', 'compressed', 'thumbnail']:
|
||||
for attr in ["file", "compressed", "thumbnail"]:
|
||||
name = self.__getattribute__(attr).name
|
||||
with open(os.path.join(settings.MEDIA_ROOT, name).encode('utf-8'), 'r+b') as file:
|
||||
with open(
|
||||
os.path.join(settings.MEDIA_ROOT, name).encode("utf-8"), "r+b"
|
||||
) as file:
|
||||
if file:
|
||||
im = Image.open(BytesIO(file.read()))
|
||||
file.seek(0)
|
||||
im = im.rotate(degree, expand=True)
|
||||
im.save(fp=file, format=self.mime_type.split('/')[-1].upper(), quality=90, optimize=True, progressive=True)
|
||||
im.save(
|
||||
fp=file,
|
||||
format=self.mime_type.split("/")[-1].upper(),
|
||||
quality=90,
|
||||
optimize=True,
|
||||
progressive=True,
|
||||
)
|
||||
|
||||
def get_next(self):
|
||||
if self.is_moderated:
|
||||
return self.parent.children.filter(is_moderated=True, asked_for_removal=False, is_folder=False,
|
||||
id__gt=self.id).order_by('id').first()
|
||||
return (
|
||||
self.parent.children.filter(
|
||||
is_moderated=True,
|
||||
asked_for_removal=False,
|
||||
is_folder=False,
|
||||
id__gt=self.id,
|
||||
)
|
||||
.order_by("id")
|
||||
.first()
|
||||
)
|
||||
else:
|
||||
return Picture.objects.filter(id__gt=self.id, is_moderated=False).order_by('id').first()
|
||||
return (
|
||||
Picture.objects.filter(id__gt=self.id, is_moderated=False)
|
||||
.order_by("id")
|
||||
.first()
|
||||
)
|
||||
|
||||
def get_previous(self):
|
||||
if self.is_moderated:
|
||||
return self.parent.children.filter(is_moderated=True, asked_for_removal=False, is_folder=False,
|
||||
id__lt=self.id).order_by('id').last()
|
||||
return (
|
||||
self.parent.children.filter(
|
||||
is_moderated=True,
|
||||
asked_for_removal=False,
|
||||
is_folder=False,
|
||||
id__lt=self.id,
|
||||
)
|
||||
.order_by("id")
|
||||
.last()
|
||||
)
|
||||
else:
|
||||
return Picture.objects.filter(id__lt=self.id, is_moderated=False).order_by('-id').first()
|
||||
return (
|
||||
Picture.objects.filter(id__lt=self.id, is_moderated=False)
|
||||
.order_by("-id")
|
||||
.first()
|
||||
)
|
||||
|
||||
|
||||
class Album(SithFile):
|
||||
@ -145,25 +188,34 @@ class Album(SithFile):
|
||||
|
||||
def can_be_edited_by(self, user):
|
||||
# file = SithFile.objects.filter(id=self.id).first()
|
||||
return user.is_in_group(settings.SITH_GROUP_SAS_ADMIN_ID) # or user.can_edit(file)
|
||||
return user.is_in_group(
|
||||
settings.SITH_GROUP_SAS_ADMIN_ID
|
||||
) # or user.can_edit(file)
|
||||
|
||||
def can_be_viewed_by(self, user):
|
||||
# file = SithFile.objects.filter(id=self.id).first()
|
||||
return self.can_be_edited_by(user) or (self.is_in_sas and self.is_moderated and
|
||||
user.was_subscribed) # or user.can_view(file)
|
||||
return self.can_be_edited_by(user) or (
|
||||
self.is_in_sas and self.is_moderated and user.was_subscribed
|
||||
) # or user.can_view(file)
|
||||
|
||||
def get_absolute_url(self):
|
||||
return reverse('sas:album', kwargs={'album_id': self.id})
|
||||
return reverse("sas:album", kwargs={"album_id": self.id})
|
||||
|
||||
def get_download_url(self):
|
||||
return reverse('sas:album_preview', kwargs={'album_id': self.id})
|
||||
return reverse("sas:album_preview", kwargs={"album_id": self.id})
|
||||
|
||||
def generate_thumbnail(self):
|
||||
p = self.children_pictures.order_by('?').first() or self.children_albums.exclude(file=None).exclude(file="").order_by('?').first()
|
||||
p = (
|
||||
self.children_pictures.order_by("?").first()
|
||||
or self.children_albums.exclude(file=None)
|
||||
.exclude(file="")
|
||||
.order_by("?")
|
||||
.first()
|
||||
)
|
||||
if p and p.file:
|
||||
im = Image.open(BytesIO(p.file.read()))
|
||||
self.file = resize_image(im, 200, "jpeg")
|
||||
self.file.name = self.name + '/thumb.jpg'
|
||||
self.file.name = self.name + "/thumb.jpg"
|
||||
self.save()
|
||||
|
||||
|
||||
@ -182,11 +234,20 @@ class PeoplePictureRelation(models.Model):
|
||||
The PeoplePictureRelation class makes the connection between User and Picture
|
||||
|
||||
"""
|
||||
user = models.ForeignKey(User, verbose_name=_('user'), related_name="pictures", null=False, blank=False)
|
||||
picture = models.ForeignKey(Picture, verbose_name=_('picture'), related_name="people", null=False, blank=False)
|
||||
|
||||
user = models.ForeignKey(
|
||||
User, verbose_name=_("user"), related_name="pictures", null=False, blank=False
|
||||
)
|
||||
picture = models.ForeignKey(
|
||||
Picture,
|
||||
verbose_name=_("picture"),
|
||||
related_name="people",
|
||||
null=False,
|
||||
blank=False,
|
||||
)
|
||||
|
||||
class Meta:
|
||||
unique_together = ['user', 'picture']
|
||||
unique_together = ["user", "picture"]
|
||||
|
||||
def __str__(self):
|
||||
return self.user.get_display_name() + " - " + str(self.picture)
|
||||
|
40
sas/urls.py
40
sas/urls.py
@ -27,17 +27,35 @@ from django.conf.urls import url
|
||||
from sas.views import *
|
||||
|
||||
urlpatterns = [
|
||||
url(r'^$', SASMainView.as_view(), name='main'),
|
||||
url(r'^moderation$', ModerationView.as_view(), name='moderation'),
|
||||
url(r'^album/(?P<album_id>[0-9]+)$', AlbumView.as_view(), name='album'),
|
||||
url(r'^album/(?P<album_id>[0-9]+)/upload$', AlbumUploadView.as_view(), name='album_upload'),
|
||||
url(r'^album/(?P<album_id>[0-9]+)/edit$', AlbumEditView.as_view(), name='album_edit'),
|
||||
url(r'^album/(?P<album_id>[0-9]+)/preview$', send_album, name='album_preview'),
|
||||
url(r'^picture/(?P<picture_id>[0-9]+)$', PictureView.as_view(), name='picture'),
|
||||
url(r'^picture/(?P<picture_id>[0-9]+)/edit$', PictureEditView.as_view(), name='picture_edit'),
|
||||
url(r'^picture/(?P<picture_id>[0-9]+)/download$', send_pict, name='download'),
|
||||
url(r'^picture/(?P<picture_id>[0-9]+)/download/compressed$', send_compressed, name='download_compressed'),
|
||||
url(r'^picture/(?P<picture_id>[0-9]+)/download/thumb$', send_thumb, name='download_thumb'),
|
||||
url(r"^$", SASMainView.as_view(), name="main"),
|
||||
url(r"^moderation$", ModerationView.as_view(), name="moderation"),
|
||||
url(r"^album/(?P<album_id>[0-9]+)$", AlbumView.as_view(), name="album"),
|
||||
url(
|
||||
r"^album/(?P<album_id>[0-9]+)/upload$",
|
||||
AlbumUploadView.as_view(),
|
||||
name="album_upload",
|
||||
),
|
||||
url(
|
||||
r"^album/(?P<album_id>[0-9]+)/edit$", AlbumEditView.as_view(), name="album_edit"
|
||||
),
|
||||
url(r"^album/(?P<album_id>[0-9]+)/preview$", send_album, name="album_preview"),
|
||||
url(r"^picture/(?P<picture_id>[0-9]+)$", PictureView.as_view(), name="picture"),
|
||||
url(
|
||||
r"^picture/(?P<picture_id>[0-9]+)/edit$",
|
||||
PictureEditView.as_view(),
|
||||
name="picture_edit",
|
||||
),
|
||||
url(r"^picture/(?P<picture_id>[0-9]+)/download$", send_pict, name="download"),
|
||||
url(
|
||||
r"^picture/(?P<picture_id>[0-9]+)/download/compressed$",
|
||||
send_compressed,
|
||||
name="download_compressed",
|
||||
),
|
||||
url(
|
||||
r"^picture/(?P<picture_id>[0-9]+)/download/thumb$",
|
||||
send_thumb,
|
||||
name="download_thumb",
|
||||
),
|
||||
# url(r'^album/new$', AlbumCreateView.as_view(), name='album_new'),
|
||||
# url(r'^(?P<club_id>[0-9]+)/$', ClubView.as_view(), name='club_view'),
|
||||
]
|
||||
|
192
sas/views.py
192
sas/views.py
@ -44,22 +44,43 @@ from sas.models import Picture, Album, PeoplePictureRelation
|
||||
|
||||
|
||||
class SASForm(forms.Form):
|
||||
album_name = forms.CharField(label=_("Add a new album"), max_length=30, required=False)
|
||||
images = forms.ImageField(widget=forms.ClearableFileInput(attrs={'multiple': True}), label=_("Upload images"),
|
||||
required=False)
|
||||
album_name = forms.CharField(
|
||||
label=_("Add a new album"), max_length=30, required=False
|
||||
)
|
||||
images = forms.ImageField(
|
||||
widget=forms.ClearableFileInput(attrs={"multiple": True}),
|
||||
label=_("Upload images"),
|
||||
required=False,
|
||||
)
|
||||
|
||||
def process(self, parent, owner, files, automodere=False):
|
||||
try:
|
||||
if self.cleaned_data['album_name'] != "":
|
||||
album = Album(parent=parent, name=self.cleaned_data['album_name'], owner=owner, is_moderated=automodere)
|
||||
if self.cleaned_data["album_name"] != "":
|
||||
album = Album(
|
||||
parent=parent,
|
||||
name=self.cleaned_data["album_name"],
|
||||
owner=owner,
|
||||
is_moderated=automodere,
|
||||
)
|
||||
album.clean()
|
||||
album.save()
|
||||
except Exception as e:
|
||||
self.add_error(None, _("Error creating album %(album)s: %(msg)s") %
|
||||
{'album': self.cleaned_data['album_name'], 'msg': repr(e)})
|
||||
self.add_error(
|
||||
None,
|
||||
_("Error creating album %(album)s: %(msg)s")
|
||||
% {"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)
|
||||
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,
|
||||
)
|
||||
if automodere:
|
||||
new_file.moderator = owner
|
||||
try:
|
||||
@ -67,30 +88,41 @@ class SASForm(forms.Form):
|
||||
new_file.generate_thumbnails()
|
||||
new_file.save()
|
||||
except Exception as e:
|
||||
self.add_error(None, _("Error uploading file %(file_name)s: %(msg)s") % {'file_name': f, 'msg': repr(e)})
|
||||
self.add_error(
|
||||
None,
|
||||
_("Error uploading file %(file_name)s: %(msg)s")
|
||||
% {"file_name": f, "msg": repr(e)},
|
||||
)
|
||||
|
||||
|
||||
class RelationForm(forms.ModelForm):
|
||||
class Meta:
|
||||
model = PeoplePictureRelation
|
||||
fields = ['picture']
|
||||
widgets = {'picture': forms.HiddenInput}
|
||||
users = AutoCompleteSelectMultipleField('users', show_help_text=False, help_text="", label=_("Add user"), required=False)
|
||||
fields = ["picture"]
|
||||
widgets = {"picture": forms.HiddenInput}
|
||||
|
||||
users = AutoCompleteSelectMultipleField(
|
||||
"users", show_help_text=False, help_text="", label=_("Add user"), required=False
|
||||
)
|
||||
|
||||
|
||||
class SASMainView(FormView):
|
||||
form_class = SASForm
|
||||
template_name = "sas/main.jinja"
|
||||
success_url = reverse_lazy('sas:main')
|
||||
success_url = reverse_lazy("sas:main")
|
||||
|
||||
def post(self, request, *args, **kwargs):
|
||||
self.form = self.get_form()
|
||||
parent = SithFile.objects.filter(id=settings.SITH_SAS_ROOT_DIR_ID).first()
|
||||
files = request.FILES.getlist('images')
|
||||
files = request.FILES.getlist("images")
|
||||
root = User.objects.filter(username="root").first()
|
||||
if request.user.is_authenticated() and request.user.is_in_group(settings.SITH_GROUP_SAS_ADMIN_ID):
|
||||
if request.user.is_authenticated() and request.user.is_in_group(
|
||||
settings.SITH_GROUP_SAS_ADMIN_ID
|
||||
):
|
||||
if self.form.is_valid():
|
||||
self.form.process(parent=parent, owner=root, files=files, automodere=True)
|
||||
self.form.process(
|
||||
parent=parent, owner=root, files=files, automodere=True
|
||||
)
|
||||
if self.form.is_valid():
|
||||
return super(SASMainView, self).form_valid(self.form)
|
||||
else:
|
||||
@ -99,8 +131,10 @@ class SASMainView(FormView):
|
||||
|
||||
def get_context_data(self, **kwargs):
|
||||
kwargs = super(SASMainView, self).get_context_data(**kwargs)
|
||||
kwargs['categories'] = Album.objects.filter(parent__id=settings.SITH_SAS_ROOT_DIR_ID).order_by('id')
|
||||
kwargs['latest'] = Album.objects.filter(is_moderated=True).order_by('-id')[:5]
|
||||
kwargs["categories"] = Album.objects.filter(
|
||||
parent__id=settings.SITH_SAS_ROOT_DIR_ID
|
||||
).order_by("id")
|
||||
kwargs["latest"] = Album.objects.filter(is_moderated=True).order_by("-id")[:5]
|
||||
return kwargs
|
||||
|
||||
|
||||
@ -111,23 +145,27 @@ class PictureView(CanViewMixin, DetailView, FormMixin):
|
||||
template_name = "sas/picture.jinja"
|
||||
|
||||
def get_initial(self):
|
||||
return {'picture': self.object}
|
||||
return {"picture": self.object}
|
||||
|
||||
def get(self, request, *args, **kwargs):
|
||||
self.object = self.get_object()
|
||||
self.form = self.get_form()
|
||||
if 'rotate_right' in request.GET.keys():
|
||||
if "rotate_right" in request.GET.keys():
|
||||
self.object.rotate(270)
|
||||
if 'rotate_left' in request.GET.keys():
|
||||
if "rotate_left" in request.GET.keys():
|
||||
self.object.rotate(90)
|
||||
if 'remove_user' in request.GET.keys():
|
||||
if "remove_user" in request.GET.keys():
|
||||
try:
|
||||
user = User.objects.filter(id=int(request.GET['remove_user'])).first()
|
||||
if user.id == request.user.id or request.user.is_in_group(settings.SITH_GROUP_SAS_ADMIN_ID):
|
||||
PeoplePictureRelation.objects.filter(user=user, picture=self.object).delete()
|
||||
user = User.objects.filter(id=int(request.GET["remove_user"])).first()
|
||||
if user.id == request.user.id or request.user.is_in_group(
|
||||
settings.SITH_GROUP_SAS_ADMIN_ID
|
||||
):
|
||||
PeoplePictureRelation.objects.filter(
|
||||
user=user, picture=self.object
|
||||
).delete()
|
||||
except:
|
||||
pass
|
||||
if 'ask_removal' in request.GET.keys():
|
||||
if "ask_removal" in request.GET.keys():
|
||||
self.object.is_moderated = False
|
||||
self.object.asked_for_removal = True
|
||||
self.object.save()
|
||||
@ -139,12 +177,19 @@ class PictureView(CanViewMixin, DetailView, FormMixin):
|
||||
self.form = self.get_form()
|
||||
if request.user.is_authenticated() and request.user.was_subscribed:
|
||||
if self.form.is_valid():
|
||||
for uid in self.form.cleaned_data['users']:
|
||||
for uid in self.form.cleaned_data["users"]:
|
||||
u = User.objects.filter(id=uid).first()
|
||||
PeoplePictureRelation(user=u,
|
||||
picture=self.form.cleaned_data['picture']).save()
|
||||
if not u.notifications.filter(type="NEW_PICTURES", viewed=False).exists():
|
||||
Notification(user=u, url=reverse("core:user_pictures", kwargs={'user_id': u.id}), type="NEW_PICTURES").save()
|
||||
PeoplePictureRelation(
|
||||
user=u, picture=self.form.cleaned_data["picture"]
|
||||
).save()
|
||||
if not u.notifications.filter(
|
||||
type="NEW_PICTURES", viewed=False
|
||||
).exists():
|
||||
Notification(
|
||||
user=u,
|
||||
url=reverse("core:user_pictures", kwargs={"user_id": u.id}),
|
||||
type="NEW_PICTURES",
|
||||
).save()
|
||||
return super(PictureView, self).form_valid(self.form)
|
||||
else:
|
||||
self.form.add_error(None, _("You do not have the permission to do that"))
|
||||
@ -152,16 +197,17 @@ class PictureView(CanViewMixin, DetailView, FormMixin):
|
||||
|
||||
def get_context_data(self, **kwargs):
|
||||
kwargs = super(PictureView, self).get_context_data(**kwargs)
|
||||
kwargs['form'] = self.form
|
||||
kwargs["form"] = self.form
|
||||
return kwargs
|
||||
|
||||
def get_success_url(self):
|
||||
return reverse('sas:picture', kwargs={'picture_id': self.object.id})
|
||||
return reverse("sas:picture", kwargs={"picture_id": self.object.id})
|
||||
|
||||
|
||||
def send_album(request, album_id):
|
||||
return send_file(request, album_id, Album)
|
||||
|
||||
|
||||
def send_pict(request, picture_id):
|
||||
return send_file(request, picture_id, Picture)
|
||||
|
||||
@ -185,11 +231,17 @@ class AlbumUploadView(CanViewMixin, DetailView, FormMixin):
|
||||
self.object.generate_thumbnail()
|
||||
self.form = self.get_form()
|
||||
parent = SithFile.objects.filter(id=self.object.id).first()
|
||||
files = request.FILES.getlist('images')
|
||||
files = request.FILES.getlist("images")
|
||||
if request.user.is_authenticated() and request.user.is_subscribed:
|
||||
if self.form.is_valid():
|
||||
self.form.process(parent=parent, owner=request.user, files=files,
|
||||
automodere=request.user.is_in_group(settings.SITH_GROUP_SAS_ADMIN_ID))
|
||||
self.form.process(
|
||||
parent=parent,
|
||||
owner=request.user,
|
||||
files=files,
|
||||
automodere=request.user.is_in_group(
|
||||
settings.SITH_GROUP_SAS_ADMIN_ID
|
||||
),
|
||||
)
|
||||
if self.form.is_valid():
|
||||
return HttpResponse(str(self.form.errors), status=200)
|
||||
return HttpResponse(str(self.form.errors), status=500)
|
||||
@ -203,8 +255,8 @@ class AlbumView(CanViewMixin, DetailView, FormMixin):
|
||||
|
||||
def get(self, request, *args, **kwargs):
|
||||
self.form = self.get_form()
|
||||
if 'clipboard' not in request.session.keys():
|
||||
request.session['clipboard'] = []
|
||||
if "clipboard" not in request.session.keys():
|
||||
request.session["clipboard"] = []
|
||||
return super(AlbumView, self).get(request, *args, **kwargs)
|
||||
|
||||
def post(self, request, *args, **kwargs):
|
||||
@ -212,16 +264,22 @@ class AlbumView(CanViewMixin, DetailView, FormMixin):
|
||||
if not self.object.file:
|
||||
self.object.generate_thumbnail()
|
||||
self.form = self.get_form()
|
||||
if 'clipboard' not in request.session.keys():
|
||||
request.session['clipboard'] = []
|
||||
if "clipboard" not in request.session.keys():
|
||||
request.session["clipboard"] = []
|
||||
if request.user.can_edit(self.object): # Handle the copy-paste functions
|
||||
FileView.handle_clipboard(request, self.object)
|
||||
parent = SithFile.objects.filter(id=self.object.id).first()
|
||||
files = request.FILES.getlist('images')
|
||||
files = request.FILES.getlist("images")
|
||||
if request.user.is_authenticated() and request.user.is_subscribed:
|
||||
if self.form.is_valid():
|
||||
self.form.process(parent=parent, owner=request.user, files=files,
|
||||
automodere=request.user.is_in_group(settings.SITH_GROUP_SAS_ADMIN_ID))
|
||||
self.form.process(
|
||||
parent=parent,
|
||||
owner=request.user,
|
||||
files=files,
|
||||
automodere=request.user.is_in_group(
|
||||
settings.SITH_GROUP_SAS_ADMIN_ID
|
||||
),
|
||||
)
|
||||
if self.form.is_valid():
|
||||
return super(AlbumView, self).form_valid(self.form)
|
||||
else:
|
||||
@ -229,14 +287,17 @@ class AlbumView(CanViewMixin, DetailView, FormMixin):
|
||||
return self.form_invalid(self.form)
|
||||
|
||||
def get_success_url(self):
|
||||
return reverse('sas:album', kwargs={'album_id': self.object.id})
|
||||
return reverse("sas:album", kwargs={"album_id": self.object.id})
|
||||
|
||||
def get_context_data(self, **kwargs):
|
||||
kwargs = super(AlbumView, self).get_context_data(**kwargs)
|
||||
kwargs['form'] = self.form
|
||||
kwargs['clipboard'] = SithFile.objects.filter(id__in=self.request.session['clipboard'])
|
||||
kwargs["form"] = self.form
|
||||
kwargs["clipboard"] = SithFile.objects.filter(
|
||||
id__in=self.request.session["clipboard"]
|
||||
)
|
||||
return kwargs
|
||||
|
||||
|
||||
# Admin views
|
||||
|
||||
|
||||
@ -251,12 +312,12 @@ class ModerationView(TemplateView):
|
||||
def post(self, request, *args, **kwargs):
|
||||
if request.user.is_in_group(settings.SITH_GROUP_SAS_ADMIN_ID):
|
||||
try:
|
||||
a = Album.objects.filter(id=request.POST['album_id']).first()
|
||||
if 'moderate' in request.POST.keys():
|
||||
a = Album.objects.filter(id=request.POST["album_id"]).first()
|
||||
if "moderate" in request.POST.keys():
|
||||
a.moderator = request.user
|
||||
a.is_moderated = True
|
||||
a.save()
|
||||
elif 'delete' in request.POST.keys():
|
||||
elif "delete" in request.POST.keys():
|
||||
a.delete()
|
||||
except:
|
||||
pass
|
||||
@ -264,45 +325,52 @@ class ModerationView(TemplateView):
|
||||
|
||||
def get_context_data(self, **kwargs):
|
||||
kwargs = super(ModerationView, self).get_context_data(**kwargs)
|
||||
kwargs['albums_to_moderate'] = Album.objects.filter(is_moderated=False, is_in_sas=True,
|
||||
is_folder=True).order_by('id')
|
||||
kwargs['pictures'] = Picture.objects.filter(is_moderated=False, is_in_sas=True, is_folder=False)
|
||||
kwargs['albums'] = Album.objects.filter(id__in=kwargs['pictures'].values('parent').distinct('parent'))
|
||||
kwargs["albums_to_moderate"] = Album.objects.filter(
|
||||
is_moderated=False, is_in_sas=True, is_folder=True
|
||||
).order_by("id")
|
||||
kwargs["pictures"] = Picture.objects.filter(
|
||||
is_moderated=False, is_in_sas=True, is_folder=False
|
||||
)
|
||||
kwargs["albums"] = Album.objects.filter(
|
||||
id__in=kwargs["pictures"].values("parent").distinct("parent")
|
||||
)
|
||||
return kwargs
|
||||
|
||||
|
||||
class PictureEditForm(forms.ModelForm):
|
||||
class Meta:
|
||||
model = Picture
|
||||
fields = ['name', 'parent']
|
||||
parent = make_ajax_field(Picture, 'parent', 'files', help_text="")
|
||||
fields = ["name", "parent"]
|
||||
|
||||
parent = make_ajax_field(Picture, "parent", "files", help_text="")
|
||||
|
||||
|
||||
class AlbumEditForm(forms.ModelForm):
|
||||
class Meta:
|
||||
model = Album
|
||||
fields = ['name', 'date', 'file', 'parent', 'edit_groups']
|
||||
fields = ["name", "date", "file", "parent", "edit_groups"]
|
||||
|
||||
date = forms.DateField(label=_("Date"), widget=SelectDate, required=True)
|
||||
parent = make_ajax_field(Album, 'parent', 'files', help_text="")
|
||||
edit_groups = make_ajax_field(Album, 'edit_groups', 'groups', help_text="")
|
||||
parent = make_ajax_field(Album, "parent", "files", help_text="")
|
||||
edit_groups = make_ajax_field(Album, "edit_groups", "groups", help_text="")
|
||||
recursive = forms.BooleanField(label=_("Apply rights recursively"), required=False)
|
||||
|
||||
|
||||
class PictureEditView(CanEditMixin, UpdateView):
|
||||
model = Picture
|
||||
form_class = PictureEditForm
|
||||
template_name = 'core/edit.jinja'
|
||||
template_name = "core/edit.jinja"
|
||||
pk_url_kwarg = "picture_id"
|
||||
|
||||
|
||||
class AlbumEditView(CanEditMixin, UpdateView):
|
||||
model = Album
|
||||
form_class = AlbumEditForm
|
||||
template_name = 'core/edit.jinja'
|
||||
template_name = "core/edit.jinja"
|
||||
pk_url_kwarg = "album_id"
|
||||
|
||||
def form_valid(self, form):
|
||||
ret = super(AlbumEditView, self).form_valid(form)
|
||||
if form.cleaned_data['recursive']:
|
||||
if form.cleaned_data["recursive"]:
|
||||
self.object.apply_rights_recursively(True)
|
||||
return ret
|
||||
|
Reference in New Issue
Block a user