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

Remove QuikNotifMixin

Browse Source
This commit is contained in:
Antoine Bartuccio
2025-09-23 20:26:23 +02:00
parent c6e86841b3
commit 7eaf25a64f
11 changed files with 116 additions and 146 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
trombi/views.py
View File

@@ -26,6 +26,7 @@ from datetime import date
from django import forms
from django.conf import settings
from django.contrib import messages
from django.contrib.auth.mixins import LoginRequiredMixin
from django.core.exceptions import PermissionDenied
from django.db import IntegrityError
@@ -46,7 +47,7 @@ from core.auth.mixins import (
)
from core.models import User
from core.views.forms import SelectDate
from core.views.mixins import QuickNotifMixin, TabedViewMixin
from core.views.mixins import TabedViewMixin
from core.views.widgets.ajax_select import AutoCompleteSelectUser
from trombi.models import Trombi, TrombiClubMembership, TrombiComment, TrombiUser
@@ -142,7 +143,8 @@ class TrombiEditView(CanEditPropMixin, TrombiTabsMixin, UpdateView):
current_tab = "admin_tools"
def get_success_url(self):
return super().get_success_url() + "?qn_success"
messages.success(self.request, _("Trombi modified"))
return super().get_success_url()
class AddUserForm(forms.Form):
@@ -155,7 +157,7 @@ class AddUserForm(forms.Form):
)
class TrombiDetailView(CanEditMixin, QuickNotifMixin, TrombiTabsMixin, DetailView):
class TrombiDetailView(CanEditMixin, TrombiTabsMixin, DetailView):
model = Trombi
template_name = "trombi/detail.jinja"
pk_url_kwarg = "trombi_id"
@@ -167,9 +169,9 @@ class TrombiDetailView(CanEditMixin, QuickNotifMixin, TrombiTabsMixin, DetailVie
if form.is_valid():
try:
TrombiUser(user=form.cleaned_data["user"], trombi=self.object).save()
self.quick_notif_list.append("qn_success")
messages.success(self.request, _("User added to the trombi"))
except IntegrityError: # We don't care about duplicate keys
self.quick_notif_list.append("qn_fail")
messages.error(self.request, _("User couldn't be added to the trombi"))
return super().get(request, *args, **kwargs)
def get_context_data(self, **kwargs):
@@ -192,15 +194,11 @@ class TrombiDeleteUserView(CanEditPropMixin, TrombiTabsMixin, DeleteView):
current_tab = "admin_tools"
def get_success_url(self):
return (
reverse("trombi:detail", kwargs={"trombi_id": self.object.trombi.id})
+ "?qn_success"
)
messages.success(self.request, _("User removed from the trombi"))
return reverse("trombi:detail", kwargs={"trombi_id": self.object.trombi.id})
class TrombiModerateCommentsView(
CanEditPropMixin, QuickNotifMixin, TrombiTabsMixin, DetailView
):
class TrombiModerateCommentsView(CanEditPropMixin, TrombiTabsMixin, DetailView):
model = Trombi
template_name = "trombi/comment_moderation.jinja"
pk_url_kwarg = "trombi_id"
@@ -235,16 +233,18 @@ class TrombiModerateCommentView(DetailView):
if request.POST["action"] == "accept":
self.object.is_moderated = True
self.object.save()
messages.success(self.request, _("Comment accepted"))
return redirect(
reverse(
"trombi:moderate_comments",
kwargs={"trombi_id": self.object.author.trombi.id},
)
+ "?qn_success"
)
elif request.POST["action"] == "reject":
messages.success(self.request, _("Comment rejected"))
return super().get(request, *args, **kwargs)
elif request.POST["action"] == "delete" and "reason" in request.POST:
messages.success(self.request, _("Comment removed"))
self.object.author.user.email_user(
subject="[%s] %s" % (settings.SITH_NAME, _("Rejected comment")),
message=_(
@@ -265,7 +265,6 @@ class TrombiModerateCommentView(DetailView):
"trombi:moderate_comments",
kwargs={"trombi_id": self.object.author.trombi.id},
)
+ "?qn_success"
)
raise Http404
@@ -299,9 +298,7 @@ class UserTrombiForm(forms.Form):
)
class UserTrombiToolsView(
LoginRequiredMixin, QuickNotifMixin, TrombiTabsMixin, TemplateView
):
class UserTrombiToolsView(LoginRequiredMixin, TrombiTabsMixin, TemplateView):
"""Display a user's trombi tools."""
template_name = "trombi/user_tools.jinja"
@@ -318,7 +315,6 @@ class UserTrombiToolsView(
user=request.user, trombi=self.form.cleaned_data["trombi"]
)
trombi_user.save()
self.quick_notif_list += ["qn_success"]
return super().get(request, *args, **kwargs)
def get_context_data(self, **kwargs):
@@ -345,12 +341,10 @@ class UserTrombiEditPicturesView(TrombiTabsMixin, UserIsInATrombiMixin, UpdateVi
return self.request.user.trombi_user
def get_success_url(self):
return reverse("trombi:user_tools") + "?qn_success"
return reverse("trombi:user_tools")
class UserTrombiEditProfileView(
QuickNotifMixin, TrombiTabsMixin, UserIsInATrombiMixin, UpdateView
):
class UserTrombiEditProfileView(TrombiTabsMixin, UserIsInATrombiMixin, UpdateView):
model = User
form_class = modelform_factory(
User,
@@ -375,7 +369,8 @@ class UserTrombiEditProfileView(
return self.request.user
def get_success_url(self):
return reverse("trombi:user_tools") + "?qn_success"
messages.success(self.request, _("User modified"))
return reverse("trombi:user_tools")
class UserTrombiResetClubMembershipsView(UserIsInATrombiMixin, RedirectView):
@@ -387,7 +382,7 @@ class UserTrombiResetClubMembershipsView(UserIsInATrombiMixin, RedirectView):
return redirect(self.get_success_url())
def get_success_url(self):
return reverse("trombi:profile") + "?qn_success"
return reverse("trombi:profile")
class UserTrombiDeleteMembershipView(TrombiTabsMixin, CanEditMixin, DeleteView):
@@ -398,7 +393,7 @@ class UserTrombiDeleteMembershipView(TrombiTabsMixin, CanEditMixin, DeleteView):
current_tab = "profile"
def get_success_url(self):
return super().get_success_url() + "?qn_success"
return super().get_success_url()
# Used by admins when someone does not have every club in his list
@@ -436,7 +431,7 @@ class UserTrombiEditMembershipView(CanEditMixin, TrombiTabsMixin, UpdateView):
current_tab = "profile"
def get_success_url(self):
return super().get_success_url() + "?qn_success"
return super().get_success_url()
class UserTrombiProfileView(TrombiTabsMixin, DetailView):
@@ -496,7 +491,7 @@ class TrombiCommentFormView(LoginRequiredMixin, View):
)
def get_success_url(self):
return reverse("trombi:user_tools") + "?qn_success"
return reverse("trombi:user_tools")
def get_context_data(self, **kwargs):
kwargs = super().get_context_data(**kwargs)