mirror of
https://github.com/ae-utbm/sith.git
synced 2025-07-09 19:40:19 +00:00
Make core.User
inherit from AbstractUser
instead of AbstractBaseUser
This commit is contained in:
52
com/views.py
52
com/views.py
@ -28,7 +28,7 @@ from smtplib import SMTPRecipientsRefused
|
||||
from django import forms
|
||||
from django.conf import settings
|
||||
from django.core.exceptions import PermissionDenied, ValidationError
|
||||
from django.db.models import Max
|
||||
from django.db.models import Exists, Max, OuterRef
|
||||
from django.forms.models import modelform_factory
|
||||
from django.http import HttpResponseRedirect
|
||||
from django.shortcuts import get_object_or_404, redirect
|
||||
@ -42,7 +42,7 @@ from django.views.generic.edit import CreateView, DeleteView, UpdateView
|
||||
|
||||
from club.models import Club, Mailing
|
||||
from com.models import News, NewsDate, Poster, Screen, Sith, Weekmail, WeekmailArticle
|
||||
from core.models import Notification, RealGroup, User
|
||||
from core.models import Notification, User
|
||||
from core.views import (
|
||||
CanCreateMixin,
|
||||
CanEditMixin,
|
||||
@ -278,21 +278,18 @@ class NewsEditView(CanEditMixin, UpdateView):
|
||||
else:
|
||||
self.object.is_moderated = False
|
||||
self.object.save()
|
||||
for u in (
|
||||
RealGroup.objects.filter(id=settings.SITH_GROUP_COM_ADMIN_ID)
|
||||
.first()
|
||||
.users.all()
|
||||
unread_notif_subquery = Notification.objects.filter(
|
||||
user=OuterRef("pk"), type="NEWS_MODERATION", viewed=False
|
||||
)
|
||||
for user in User.objects.filter(
|
||||
~Exists(unread_notif_subquery),
|
||||
groups__id__in=[settings.SITH_GROUP_COM_ADMIN_ID],
|
||||
):
|
||||
if not u.notifications.filter(
|
||||
type="NEWS_MODERATION", viewed=False
|
||||
).exists():
|
||||
Notification(
|
||||
user=u,
|
||||
url=reverse(
|
||||
"com:news_detail", kwargs={"news_id": self.object.id}
|
||||
),
|
||||
type="NEWS_MODERATION",
|
||||
).save()
|
||||
Notification.objects.create(
|
||||
user=user,
|
||||
url=self.object.get_absolute_url(),
|
||||
type="NEWS_MODERATION",
|
||||
)
|
||||
return super().form_valid(form)
|
||||
|
||||
|
||||
@ -323,19 +320,18 @@ class NewsCreateView(CanCreateMixin, CreateView):
|
||||
self.object.is_moderated = True
|
||||
self.object.save()
|
||||
else:
|
||||
for u in (
|
||||
RealGroup.objects.filter(id=settings.SITH_GROUP_COM_ADMIN_ID)
|
||||
.first()
|
||||
.users.all()
|
||||
unread_notif_subquery = Notification.objects.filter(
|
||||
user=OuterRef("pk"), type="NEWS_MODERATION", viewed=False
|
||||
)
|
||||
for user in User.objects.filter(
|
||||
~Exists(unread_notif_subquery),
|
||||
groups__id__in=[settings.SITH_GROUP_COM_ADMIN_ID],
|
||||
):
|
||||
if not u.notifications.filter(
|
||||
type="NEWS_MODERATION", viewed=False
|
||||
).exists():
|
||||
Notification(
|
||||
user=u,
|
||||
url=reverse("com:news_admin_list"),
|
||||
type="NEWS_MODERATION",
|
||||
).save()
|
||||
Notification.objects.create(
|
||||
user=user,
|
||||
url=reverse("com:news_admin_list"),
|
||||
type="NEWS_MODERATION",
|
||||
)
|
||||
return super().form_valid(form)
|
||||
|
||||
|
||||
|
Reference in New Issue
Block a user