mirror of
https://github.com/ae-utbm/sith.git
synced 2024-11-26 11:04:20 +00:00
Merge branch 'bugfix' into 'master'
Fix some SAS and forum errors Closes #89 See merge request ae/Sith!263
This commit is contained in:
commit
9176a03a8a
@ -42,6 +42,7 @@ from core.views import (
|
|||||||
CanEditMixin,
|
CanEditMixin,
|
||||||
CanEditPropMixin,
|
CanEditPropMixin,
|
||||||
CanCreateMixin,
|
CanCreateMixin,
|
||||||
|
UserIsLoggedMixin,
|
||||||
can_view,
|
can_view,
|
||||||
)
|
)
|
||||||
from core.views.forms import MarkdownInput
|
from core.views.forms import MarkdownInput
|
||||||
@ -273,7 +274,9 @@ class ForumTopicEditView(CanEditMixin, UpdateView):
|
|||||||
template_name = "core/edit.jinja"
|
template_name = "core/edit.jinja"
|
||||||
|
|
||||||
|
|
||||||
class ForumTopicSubscribeView(CanViewMixin, SingleObjectMixin, RedirectView):
|
class ForumTopicSubscribeView(
|
||||||
|
CanViewMixin, UserIsLoggedMixin, SingleObjectMixin, RedirectView
|
||||||
|
):
|
||||||
model = ForumTopic
|
model = ForumTopic
|
||||||
pk_url_kwarg = "topic_id"
|
pk_url_kwarg = "topic_id"
|
||||||
permanent = False
|
permanent = False
|
||||||
|
@ -180,6 +180,12 @@ class PictureView(CanViewMixin, DetailView, FormMixin):
|
|||||||
if self.form.is_valid():
|
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()
|
u = User.objects.filter(id=uid).first()
|
||||||
|
if not u: # Don't use a non existing user
|
||||||
|
continue
|
||||||
|
if PeoplePictureRelation.objects.filter(
|
||||||
|
user=u, picture=self.form.cleaned_data["picture"]
|
||||||
|
).exists(): # Avoid existing relation
|
||||||
|
continue
|
||||||
PeoplePictureRelation(
|
PeoplePictureRelation(
|
||||||
user=u, picture=self.form.cleaned_data["picture"]
|
user=u, picture=self.form.cleaned_data["picture"]
|
||||||
).save()
|
).save()
|
||||||
|
Loading…
Reference in New Issue
Block a user