diff --git a/accounting/tests.py b/accounting/tests.py
index c66558e0..1140acc7 100644
--- a/accounting/tests.py
+++ b/accounting/tests.py
@@ -216,7 +216,7 @@ class TestOperation(TestCase):
self.journal.operations.filter(target_label="Le fantome du jour").exists()
)
- def test__operation_simple_accounting(self):
+ def test_operation_simple_accounting(self):
sat = SimplifiedAccountingType.objects.all().first()
response = self.client.post(
reverse("accounting:op_new", args=[self.journal.id]),
@@ -237,15 +237,14 @@ class TestOperation(TestCase):
"done": False,
},
)
- self.assertFalse(response.status_code == 403)
- self.assertTrue(self.journal.operations.filter(amount=23).exists())
+ assert response.status_code != 403
+ assert self.journal.operations.filter(amount=23).exists()
response_get = self.client.get(
reverse("accounting:journal_details", args=[self.journal.id])
)
- self.assertTrue(
- "
Le fantome de l'aurore | " in str(response_get.content)
- )
- self.assertTrue(
+ assert "Le fantome de l'aurore | " in str(response_get.content)
+
+ assert (
self.journal.operations.filter(amount=23)
.values("accounting_type")
.first()["accounting_type"]
diff --git a/accounting/views.py b/accounting/views.py
index 928dc009..ce0ae45b 100644
--- a/accounting/views.py
+++ b/accounting/views.py
@@ -215,17 +215,14 @@ class JournalTabsMixin(TabedViewMixin):
return _("Journal")
def get_list_of_tabs(self):
- tab_list = []
- tab_list.append(
+ return [
{
"url": reverse(
"accounting:journal_details", kwargs={"j_id": self.object.id}
),
"slug": "journal",
"name": _("Journal"),
- }
- )
- tab_list.append(
+ },
{
"url": reverse(
"accounting:journal_nature_statement",
@@ -233,9 +230,7 @@ class JournalTabsMixin(TabedViewMixin):
),
"slug": "nature_statement",
"name": _("Statement by nature"),
- }
- )
- tab_list.append(
+ },
{
"url": reverse(
"accounting:journal_person_statement",
@@ -243,9 +238,7 @@ class JournalTabsMixin(TabedViewMixin):
),
"slug": "person_statement",
"name": _("Statement by person"),
- }
- )
- tab_list.append(
+ },
{
"url": reverse(
"accounting:journal_accounting_statement",
@@ -253,9 +246,8 @@ class JournalTabsMixin(TabedViewMixin):
),
"slug": "accounting_statement",
"name": _("Accounting statement"),
- }
- )
- return tab_list
+ },
+ ]
class JournalCreateView(CanCreateMixin, CreateView):
diff --git a/club/migrations/0010_auto_20170912_2028.py b/club/migrations/0010_auto_20170912_2028.py
index d6e28063..aa49fc4b 100644
--- a/club/migrations/0010_auto_20170912_2028.py
+++ b/club/migrations/0010_auto_20170912_2028.py
@@ -3,19 +3,6 @@ from __future__ import unicode_literals
import django.db.models.deletion
from django.db import migrations, models
-from club.models import Club
-from core.operations import PsqlRunOnly
-
-
-def generate_club_pages(apps, schema_editor):
- def recursive_generate_club_page(club):
- club.make_page()
- for child in Club.objects.filter(parent=club).all():
- recursive_generate_club_page(child)
-
- for club in Club.objects.filter(parent=None).all():
- recursive_generate_club_page(club)
-
class Migration(migrations.Migration):
dependencies = [("core", "0024_auto_20170906_1317"), ("club", "0010_club_logo")]
@@ -48,11 +35,4 @@ class Migration(migrations.Migration):
null=True,
),
),
- PsqlRunOnly(
- "SET CONSTRAINTS ALL IMMEDIATE", reverse_sql=migrations.RunSQL.noop
- ),
- migrations.RunPython(generate_club_pages),
- PsqlRunOnly(
- migrations.RunSQL.noop, reverse_sql="SET CONSTRAINTS ALL IMMEDIATE"
- ),
]
diff --git a/club/models.py b/club/models.py
index 573fd176..5300057d 100644
--- a/club/models.py
+++ b/club/models.py
@@ -31,14 +31,14 @@ from django.core.cache import cache
from django.core.exceptions import ObjectDoesNotExist, ValidationError
from django.core.validators import RegexValidator, validate_email
from django.db import models, transaction
-from django.db.models import Q
+from django.db.models import Exists, OuterRef, Q
from django.urls import reverse
from django.utils import timezone
from django.utils.functional import cached_property
from django.utils.timezone import localdate
from django.utils.translation import gettext_lazy as _
-from core.models import Group, MetaGroup, Notification, Page, RealGroup, SithFile, User
+from core.models import Group, MetaGroup, Notification, Page, SithFile, User
# Create your models here.
@@ -438,19 +438,18 @@ class Mailing(models.Model):
def save(self, *args, **kwargs):
if not self.is_moderated:
- for user in (
- RealGroup.objects.filter(id=settings.SITH_GROUP_COM_ADMIN_ID)
- .first()
- .users.all()
+ unread_notif_subquery = Notification.objects.filter(
+ user=OuterRef("pk"), type="MAILING_MODERATION", viewed=False
+ )
+ for user in User.objects.filter(
+ ~Exists(unread_notif_subquery),
+ groups__id__in=[settings.SITH_GROUP_COM_ADMIN_ID],
):
- if not user.notifications.filter(
- type="MAILING_MODERATION", viewed=False
- ).exists():
- Notification(
- user=user,
- url=reverse("com:mailing_admin"),
- type="MAILING_MODERATION",
- ).save(*args, **kwargs)
+ Notification(
+ user=user,
+ url=reverse("com:mailing_admin"),
+ type="MAILING_MODERATION",
+ ).save(*args, **kwargs)
super().save(*args, **kwargs)
def clean(self):
diff --git a/com/models.py b/com/models.py
index cf2cb961..f3076174 100644
--- a/com/models.py
+++ b/com/models.py
@@ -34,7 +34,7 @@ from django.utils import timezone
from django.utils.translation import gettext_lazy as _
from club.models import Club
-from core.models import Notification, Preferences, RealGroup, User
+from core.models import Notification, Preferences, User
class Sith(models.Model):
@@ -108,17 +108,15 @@ class News(models.Model):
def save(self, *args, **kwargs):
super().save(*args, **kwargs)
- for u in (
- RealGroup.objects.filter(id=settings.SITH_GROUP_COM_ADMIN_ID)
- .first()
- .users.all()
+ for user in User.objects.filter(
+ groups__id__in=[settings.SITH_GROUP_COM_ADMIN_ID]
):
- Notification(
- user=u,
+ Notification.objects.create(
+ user=user,
url=reverse("com:news_admin_list"),
type="NEWS_MODERATION",
param="1",
- ).save()
+ )
def get_absolute_url(self):
return reverse("com:news_detail", kwargs={"news_id": self.id})
@@ -336,16 +334,14 @@ class Poster(models.Model):
def save(self, *args, **kwargs):
if not self.is_moderated:
- for u in (
- RealGroup.objects.filter(id=settings.SITH_GROUP_COM_ADMIN_ID)
- .first()
- .users.all()
+ for user in User.objects.filter(
+ groups__id__in=[settings.SITH_GROUP_COM_ADMIN_ID]
):
- Notification(
- user=u,
+ Notification.objects.create(
+ user=user,
url=reverse("com:poster_moderate_list"),
type="POSTER_MODERATION",
- ).save()
+ )
return super().save(*args, **kwargs)
def clean(self, *args, **kwargs):
diff --git a/com/tests.py b/com/tests.py
index 1c39fa36..399eb0e8 100644
--- a/com/tests.py
+++ b/com/tests.py
@@ -23,7 +23,7 @@ from django.utils.translation import gettext as _
from club.models import Club, Membership
from com.models import News, Poster, Sith, Weekmail, WeekmailArticle
-from core.models import AnonymousUser, RealGroup, User
+from core.models import AnonymousUser, Group, User
@pytest.fixture()
@@ -49,9 +49,7 @@ class TestCom(TestCase):
@classmethod
def setUpTestData(cls):
cls.skia = User.objects.get(username="skia")
- cls.com_group = RealGroup.objects.filter(
- id=settings.SITH_GROUP_COM_ADMIN_ID
- ).first()
+ cls.com_group = Group.objects.get(id=settings.SITH_GROUP_COM_ADMIN_ID)
cls.skia.groups.set([cls.com_group])
def setUp(self):
diff --git a/com/views.py b/com/views.py
index c3835605..d4136d20 100644
--- a/com/views.py
+++ b/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)
diff --git a/core/management/commands/populate.py b/core/management/commands/populate.py
index 7098101a..5770c715 100644
--- a/core/management/commands/populate.py
+++ b/core/management/commands/populate.py
@@ -261,19 +261,19 @@ class Command(BaseCommand):
User.groups.through.objects.bulk_create(
[
User.groups.through(
- realgroup_id=settings.SITH_GROUP_COUNTER_ADMIN_ID, user=counter
+ group_id=settings.SITH_GROUP_COUNTER_ADMIN_ID, user=counter
),
User.groups.through(
- realgroup_id=settings.SITH_GROUP_ACCOUNTING_ADMIN_ID, user=comptable
+ group_id=settings.SITH_GROUP_ACCOUNTING_ADMIN_ID, user=comptable
),
User.groups.through(
- realgroup_id=settings.SITH_GROUP_COM_ADMIN_ID, user=comunity
+ group_id=settings.SITH_GROUP_COM_ADMIN_ID, user=comunity
),
User.groups.through(
- realgroup_id=settings.SITH_GROUP_PEDAGOGY_ADMIN_ID, user=tutu
+ group_id=settings.SITH_GROUP_PEDAGOGY_ADMIN_ID, user=tutu
),
User.groups.through(
- realgroup_id=settings.SITH_GROUP_SAS_ADMIN_ID, user=skia
+ group_id=settings.SITH_GROUP_SAS_ADMIN_ID, user=skia
),
]
)
diff --git a/core/management/commands/populate_more.py b/core/management/commands/populate_more.py
index eaac58c0..f8ac1cef 100644
--- a/core/management/commands/populate_more.py
+++ b/core/management/commands/populate_more.py
@@ -11,7 +11,7 @@ from django.utils.timezone import localdate, make_aware, now
from faker import Faker
from club.models import Club, Membership
-from core.models import RealGroup, User
+from core.models import Group, User
from counter.models import (
Counter,
Customer,
@@ -225,9 +225,7 @@ class Command(BaseCommand):
ae = Club.objects.get(unix_name="ae")
other_clubs = random.sample(list(Club.objects.all()), k=3)
groups = list(
- RealGroup.objects.filter(
- name__in=["Subscribers", "Old subscribers", "Public"]
- )
+ Group.objects.filter(name__in=["Subscribers", "Old subscribers", "Public"])
)
counters = list(
Counter.objects.filter(name__in=["Foyer", "MDE", "La Gommette", "Eboutic"])
diff --git a/core/migrations/0040_alter_user_options_user_user_permissions_and_more.py b/core/migrations/0040_alter_user_options_user_user_permissions_and_more.py
new file mode 100644
index 00000000..43e4911c
--- /dev/null
+++ b/core/migrations/0040_alter_user_options_user_user_permissions_and_more.py
@@ -0,0 +1,82 @@
+# Generated by Django 4.2.16 on 2024-11-20 16:22
+
+import django.contrib.auth.validators
+import django.utils.timezone
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+ dependencies = [
+ ("auth", "0012_alter_user_first_name_max_length"),
+ ("core", "0039_alter_user_managers"),
+ ]
+
+ operations = [
+ migrations.AlterModelOptions(
+ name="user",
+ options={"verbose_name": "user", "verbose_name_plural": "users"},
+ ),
+ migrations.AddField(
+ model_name="user",
+ name="user_permissions",
+ field=models.ManyToManyField(
+ blank=True,
+ help_text="Specific permissions for this user.",
+ related_name="user_set",
+ related_query_name="user",
+ to="auth.permission",
+ verbose_name="user permissions",
+ ),
+ ),
+ migrations.AlterField(
+ model_name="user",
+ name="date_joined",
+ field=models.DateTimeField(
+ default=django.utils.timezone.now, verbose_name="date joined"
+ ),
+ ),
+ migrations.AlterField(
+ model_name="user",
+ name="is_superuser",
+ field=models.BooleanField(
+ default=False,
+ help_text="Designates that this user has all permissions without explicitly assigning them.",
+ verbose_name="superuser status",
+ ),
+ ),
+ migrations.AlterField(
+ model_name="user",
+ name="username",
+ field=models.CharField(
+ error_messages={"unique": "A user with that username already exists."},
+ help_text="Required. 150 characters or fewer. Letters, digits and @/./+/-/_ only.",
+ max_length=150,
+ unique=True,
+ validators=[django.contrib.auth.validators.UnicodeUsernameValidator()],
+ verbose_name="username",
+ ),
+ ),
+ migrations.AlterField(
+ model_name="user",
+ name="groups",
+ field=models.ManyToManyField(
+ blank=True,
+ help_text="The groups this user belongs to. A user will get all permissions granted to each of their groups.",
+ related_name="user_set",
+ related_query_name="user",
+ to="auth.group",
+ verbose_name="groups",
+ ),
+ ),
+ migrations.AlterField(
+ model_name="user",
+ name="groups",
+ field=models.ManyToManyField(
+ blank=True,
+ help_text="The groups this user belongs to. A user will get all permissions granted to each of their groups.",
+ related_name="users",
+ to="core.group",
+ verbose_name="groups",
+ ),
+ ),
+ ]
diff --git a/core/models.py b/core/models.py
index 2d578d6d..347e9bd4 100644
--- a/core/models.py
+++ b/core/models.py
@@ -30,19 +30,13 @@ import string
import unicodedata
from datetime import timedelta
from pathlib import Path
-from typing import TYPE_CHECKING, Any, Optional, Self
+from typing import TYPE_CHECKING, Optional, Self
from django.conf import settings
-from django.contrib.auth.models import AbstractBaseUser, UserManager
-from django.contrib.auth.models import (
- AnonymousUser as AuthAnonymousUser,
-)
-from django.contrib.auth.models import (
- Group as AuthGroup,
-)
-from django.contrib.auth.models import (
- GroupManager as AuthGroupManager,
-)
+from django.contrib.auth.models import AbstractUser, UserManager
+from django.contrib.auth.models import AnonymousUser as AuthAnonymousUser
+from django.contrib.auth.models import Group as AuthGroup
+from django.contrib.auth.models import GroupManager as AuthGroupManager
from django.contrib.staticfiles.storage import staticfiles_storage
from django.core import validators
from django.core.cache import cache
@@ -242,7 +236,7 @@ class CustomUserManager(UserManager.from_queryset(UserQuerySet)):
pass
-class User(AbstractBaseUser):
+class User(AbstractUser):
"""Defines the base user class, useable in every app.
This is almost the same as the auth module AbstractUser since it inherits from it,
@@ -253,51 +247,22 @@ class User(AbstractBaseUser):
Required fields: email, first_name, last_name, date_of_birth
"""
- username = models.CharField(
- _("username"),
- max_length=254,
- unique=True,
- help_text=_(
- "Required. 254 characters or fewer. Letters, digits and ./+/-/_ only."
- ),
- validators=[
- validators.RegexValidator(
- r"^[\w.+-]+$",
- _(
- "Enter a valid username. This value may contain only "
- "letters, numbers "
- "and ./+/-/_ characters."
- ),
- )
- ],
- error_messages={"unique": _("A user with that username already exists.")},
- )
first_name = models.CharField(_("first name"), max_length=64)
last_name = models.CharField(_("last name"), max_length=64)
email = models.EmailField(_("email address"), unique=True)
date_of_birth = models.DateField(_("date of birth"), blank=True, null=True)
nick_name = models.CharField(_("nick name"), max_length=64, null=True, blank=True)
- is_staff = models.BooleanField(
- _("staff status"),
- default=False,
- help_text=_("Designates whether the user can log into this admin site."),
- )
- is_active = models.BooleanField(
- _("active"),
- default=True,
- help_text=_(
- "Designates whether this user should be treated as active. "
- "Unselect this instead of deleting accounts."
- ),
- )
- date_joined = models.DateField(_("date joined"), auto_now_add=True)
last_update = models.DateTimeField(_("last update"), auto_now=True)
- is_superuser = models.BooleanField(
- _("superuser"),
- default=False,
- help_text=_("Designates whether this user is a superuser. "),
+ groups = models.ManyToManyField(
+ Group,
+ verbose_name=_("groups"),
+ help_text=_(
+ "The groups this user belongs to. A user will get all permissions "
+ "granted to each of their groups."
+ ),
+ related_name="users",
+ blank=True,
)
- groups = models.ManyToManyField(RealGroup, related_name="users", blank=True)
home = models.OneToOneField(
"SithFile",
related_name="home_of",
@@ -401,8 +366,6 @@ class User(AbstractBaseUser):
objects = CustomUserManager()
- USERNAME_FIELD = "username"
-
def __str__(self):
return self.get_display_name()
@@ -422,22 +385,23 @@ class User(AbstractBaseUser):
settings.BASE_DIR / f"core/static/core/img/promo_{self.promo}.png"
).exists()
- def has_module_perms(self, package_name: str) -> bool:
- return self.is_active
-
- def has_perm(self, perm: str, obj: Any = None) -> bool:
- return self.is_active and self.is_superuser
-
@cached_property
def was_subscribed(self) -> bool:
+ if "is_subscribed" in self.__dict__ and self.is_subscribed:
+ # if the user is currently subscribed, he is an old subscriber too
+ # if the property has already been cached, avoid another request
+ return True
return self.subscriptions.exists()
@cached_property
def is_subscribed(self) -> bool:
- s = self.subscriptions.filter(
+ if "was_subscribed" in self.__dict__ and not self.was_subscribed:
+ # if the user never subscribed, he cannot be a subscriber now.
+ # if the property has already been cached, avoid another request
+ return False
+ return self.subscriptions.filter(
subscription_start__lte=timezone.now(), subscription_end__gte=timezone.now()
- )
- return s.exists()
+ ).exists()
@cached_property
def account_balance(self):
@@ -599,11 +563,6 @@ class User(AbstractBaseUser):
"date_of_birth": self.date_of_birth,
}
- def get_full_name(self):
- """Returns the first_name plus the last_name, with a space in between."""
- full_name = "%s %s" % (self.first_name, self.last_name)
- return full_name.strip()
-
def get_short_name(self):
"""Returns the short name for the user."""
if self.nick_name:
@@ -982,13 +941,11 @@ class SithFile(models.Model):
if copy_rights:
self.copy_rights()
if self.is_in_sas:
- for u in (
- RealGroup.objects.filter(id=settings.SITH_GROUP_SAS_ADMIN_ID)
- .first()
- .users.all()
+ for user in User.objects.filter(
+ groups__id__in=[settings.SITH_GROUP_SAS_ADMIN_ID]
):
Notification(
- user=u,
+ user=user,
url=reverse("sas:moderation"),
type="SAS_MODERATION",
param="1",
diff --git a/core/tests/test_core.py b/core/tests/test_core.py
index 9b70e886..a33a8705 100644
--- a/core/tests/test_core.py
+++ b/core/tests/test_core.py
@@ -118,7 +118,9 @@ class TestUserRegistration:
response = client.post(reverse("core:register"), valid_payload)
assert response.status_code == 200
- error_html = "Un objet User avec ce champ Adresse email existe déjà."
+ error_html = (
+ "Un objet Utilisateur avec ce champ Adresse email existe déjà."
+ )
assertInHTML(error_html, str(response.content.decode()))
def test_register_fail_with_not_existing_email(
diff --git a/core/tests/test_files.py b/core/tests/test_files.py
index 1f39fcd8..998ceab5 100644
--- a/core/tests/test_files.py
+++ b/core/tests/test_files.py
@@ -14,7 +14,7 @@ from PIL import Image
from pytest_django.asserts import assertNumQueries
from core.baker_recipes import board_user, old_subscriber_user, subscriber_user
-from core.models import Group, RealGroup, SithFile, User
+from core.models import Group, SithFile, User
from sas.models import Picture
from sith import settings
@@ -26,12 +26,10 @@ class TestImageAccess:
[
lambda: baker.make(User, is_superuser=True),
lambda: baker.make(
- User,
- groups=[RealGroup.objects.get(pk=settings.SITH_GROUP_SAS_ADMIN_ID)],
+ User, groups=[Group.objects.get(pk=settings.SITH_GROUP_SAS_ADMIN_ID)]
),
lambda: baker.make(
- User,
- groups=[RealGroup.objects.get(pk=settings.SITH_GROUP_COM_ADMIN_ID)],
+ User, groups=[Group.objects.get(pk=settings.SITH_GROUP_COM_ADMIN_ID)]
),
],
)
diff --git a/core/views/files.py b/core/views/files.py
index 0d083a84..f8539080 100644
--- a/core/views/files.py
+++ b/core/views/files.py
@@ -21,6 +21,7 @@ from wsgiref.util import FileWrapper
from django import forms
from django.conf import settings
from django.core.exceptions import PermissionDenied
+from django.db.models import Exists, OuterRef
from django.forms.models import modelform_factory
from django.http import Http404, HttpRequest, HttpResponse
from django.shortcuts import get_object_or_404, redirect
@@ -31,7 +32,7 @@ from django.views.generic import DetailView, ListView
from django.views.generic.detail import SingleObjectMixin
from django.views.generic.edit import DeleteView, FormMixin, UpdateView
-from core.models import Notification, RealGroup, SithFile, User
+from core.models import Notification, SithFile, User
from core.views import (
AllowFragment,
CanEditMixin,
@@ -159,19 +160,18 @@ class AddFilesForm(forms.Form):
% {"file_name": f, "msg": repr(e)},
)
if notif:
- 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="FILE_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="FILE_MODERATION", viewed=False
- ).exists():
- Notification(
- user=u,
- url=reverse("core:file_moderation"),
- type="FILE_MODERATION",
- ).save()
+ Notification.objects.create(
+ user=user,
+ url=reverse("core:file_moderation"),
+ type="FILE_MODERATION",
+ )
class FileListView(ListView):
diff --git a/core/views/forms.py b/core/views/forms.py
index de01f7aa..ea9c27f0 100644
--- a/core/views/forms.py
+++ b/core/views/forms.py
@@ -167,9 +167,7 @@ class RegisteringForm(UserCreationForm):
class Meta:
model = User
fields = ("first_name", "last_name", "email")
- field_classes = {
- "email": AntiSpamEmailField,
- }
+ field_classes = {"email": AntiSpamEmailField}
class UserProfileForm(forms.ModelForm):
diff --git a/core/views/group.py b/core/views/group.py
index abb0097f..b6e77b54 100644
--- a/core/views/group.py
+++ b/core/views/group.py
@@ -23,9 +23,7 @@ from django.views.generic.edit import CreateView, DeleteView, UpdateView
from core.models import RealGroup, User
from core.views import CanCreateMixin, CanEditMixin, DetailFormView
-from core.views.widgets.select import (
- AutoCompleteSelectMultipleUser,
-)
+from core.views.widgets.select import AutoCompleteSelectMultipleUser
# Forms
diff --git a/counter/migrations/0013_customer_recorded_products.py b/counter/migrations/0013_customer_recorded_products.py
index f2a48ba5..72825d16 100644
--- a/counter/migrations/0013_customer_recorded_products.py
+++ b/counter/migrations/0013_customer_recorded_products.py
@@ -1,38 +1,6 @@
from __future__ import unicode_literals
-from django.conf import settings
from django.db import migrations, models
-from django.utils.translation import gettext_lazy as _
-
-from core.models import User
-from counter.models import Counter, Customer, Product, Selling
-
-
-def balance_ecocups(apps, schema_editor):
- for customer in Customer.objects.all():
- customer.recorded_products = 0
- for selling in customer.buyings.filter(
- product__id__in=[settings.SITH_ECOCUP_CONS, settings.SITH_ECOCUP_DECO]
- ).all():
- if selling.product.is_record_product:
- customer.recorded_products += selling.quantity
- elif selling.product.is_unrecord_product:
- customer.recorded_products -= selling.quantity
- if customer.recorded_products < -settings.SITH_ECOCUP_LIMIT:
- qt = -(customer.recorded_products + settings.SITH_ECOCUP_LIMIT)
- cons = Product.objects.get(id=settings.SITH_ECOCUP_CONS)
- Selling(
- label=_("Ecocup regularization"),
- product=cons,
- unit_price=cons.selling_price,
- club=cons.club,
- counter=Counter.objects.filter(name="Foyer").first(),
- quantity=qt,
- seller=User.objects.get(id=0),
- customer=customer,
- ).save(allow_negative=True)
- customer.recorded_products += qt
- customer.save()
class Migration(migrations.Migration):
@@ -44,5 +12,4 @@ class Migration(migrations.Migration):
name="recorded_products",
field=models.IntegerField(verbose_name="recorded items", default=0),
),
- migrations.RunPython(balance_ecocups),
]
diff --git a/counter/tests/test_product.py b/counter/tests/test_product.py
index a5eb39c4..8daab2b1 100644
--- a/counter/tests/test_product.py
+++ b/counter/tests/test_product.py
@@ -13,7 +13,7 @@ from PIL import Image
from pytest_django.asserts import assertNumQueries
from core.baker_recipes import board_user, subscriber_user
-from core.models import RealGroup, User
+from core.models import Group, User
from counter.models import Product, ProductType
@@ -51,16 +51,14 @@ def test_resize_product_icon(model):
(
lambda: baker.make(
User,
- groups=[RealGroup.objects.get(pk=settings.SITH_GROUP_COUNTER_ADMIN_ID)],
+ groups=[Group.objects.get(pk=settings.SITH_GROUP_COUNTER_ADMIN_ID)],
),
200,
),
(
lambda: baker.make(
User,
- groups=[
- RealGroup.objects.get(pk=settings.SITH_GROUP_ACCOUNTING_ADMIN_ID)
- ],
+ groups=[Group.objects.get(pk=settings.SITH_GROUP_ACCOUNTING_ADMIN_ID)],
),
200,
),
diff --git a/counter/tests/test_product_type.py b/counter/tests/test_product_type.py
index 7976ef85..16dc40dd 100644
--- a/counter/tests/test_product_type.py
+++ b/counter/tests/test_product_type.py
@@ -6,7 +6,7 @@ from model_bakery import baker, seq
from ninja_extra.testing import TestClient
from core.baker_recipes import board_user, subscriber_user
-from core.models import RealGroup, User
+from core.models import Group, User
from counter.api import ProductTypeController
from counter.models import ProductType
@@ -70,16 +70,14 @@ def test_move_above_product_type(product_types: list[ProductType]):
(
lambda: baker.make(
User,
- groups=[RealGroup.objects.get(pk=settings.SITH_GROUP_COUNTER_ADMIN_ID)],
+ groups=[Group.objects.get(pk=settings.SITH_GROUP_COUNTER_ADMIN_ID)],
),
200,
),
(
lambda: baker.make(
User,
- groups=[
- RealGroup.objects.get(pk=settings.SITH_GROUP_ACCOUNTING_ADMIN_ID)
- ],
+ groups=[Group.objects.get(pk=settings.SITH_GROUP_ACCOUNTING_ADMIN_ID)],
),
200,
),
diff --git a/locale/fr/LC_MESSAGES/django.po b/locale/fr/LC_MESSAGES/django.po
index ae6ed43a..015e3dd7 100644
--- a/locale/fr/LC_MESSAGES/django.po
+++ b/locale/fr/LC_MESSAGES/django.po
@@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-12-18 15:53+0100\n"
+"POT-Creation-Date: 2024-12-19 10:43+0100\n"
"PO-Revision-Date: 2016-07-18\n"
"Last-Translator: Maréchal \n"
@@ -17,8 +17,8 @@ msgstr ""
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
#: accounting/models.py:62 accounting/models.py:101 accounting/models.py:132
-#: accounting/models.py:190 club/models.py:55 com/models.py:289
-#: com/models.py:308 counter/models.py:299 counter/models.py:330
+#: accounting/models.py:190 club/models.py:55 com/models.py:287
+#: com/models.py:306 counter/models.py:299 counter/models.py:330
#: counter/models.py:481 forum/models.py:60 launderette/models.py:29
#: launderette/models.py:80 launderette/models.py:116
msgid "name"
@@ -40,7 +40,7 @@ msgstr "code postal"
msgid "country"
msgstr "pays"
-#: accounting/models.py:67 core/models.py:391
+#: accounting/models.py:67 core/models.py:356
msgid "phone"
msgstr "téléphone"
@@ -65,7 +65,7 @@ msgid "account number"
msgstr "numéro de compte"
#: accounting/models.py:107 accounting/models.py:136 club/models.py:345
-#: com/models.py:87 com/models.py:274 com/models.py:314 counter/models.py:359
+#: com/models.py:87 com/models.py:272 com/models.py:312 counter/models.py:359
#: counter/models.py:483 trombi/models.py:209
msgid "club"
msgstr "club"
@@ -126,8 +126,8 @@ msgstr "numéro"
msgid "journal"
msgstr "classeur"
-#: accounting/models.py:256 core/models.py:954 core/models.py:1465
-#: core/models.py:1510 core/models.py:1539 core/models.py:1563
+#: accounting/models.py:256 core/models.py:913 core/models.py:1422
+#: core/models.py:1467 core/models.py:1496 core/models.py:1520
#: counter/models.py:694 counter/models.py:798 counter/models.py:1002
#: eboutic/models.py:57 eboutic/models.py:193 forum/models.py:312
#: forum/models.py:413
@@ -165,7 +165,7 @@ msgid "accounting type"
msgstr "type comptable"
#: accounting/models.py:294 accounting/models.py:429 accounting/models.py:460
-#: accounting/models.py:492 core/models.py:1538 core/models.py:1564
+#: accounting/models.py:492 core/models.py:1495 core/models.py:1521
#: counter/models.py:764
msgid "label"
msgstr "étiquette"
@@ -174,7 +174,7 @@ msgstr "étiquette"
msgid "target type"
msgstr "type de cible"
-#: accounting/models.py:303 club/models.py:505
+#: accounting/models.py:303 club/models.py:504
#: club/templates/club/club_members.jinja:17
#: club/templates/club/club_old_members.jinja:8
#: club/templates/club/mailing.jinja:41
@@ -218,7 +218,7 @@ msgstr "Compte"
msgid "Company"
msgstr "Entreprise"
-#: accounting/models.py:307 core/models.py:338 sith/settings.py:423
+#: accounting/models.py:307 core/models.py:303 sith/settings.py:423
msgid "Other"
msgstr "Autre"
@@ -279,14 +279,14 @@ msgstr "type de mouvement"
#: accounting/models.py:433
#: accounting/templates/accounting/journal_statement_nature.jinja:9
#: accounting/templates/accounting/journal_statement_person.jinja:12
-#: accounting/views.py:574
+#: accounting/views.py:566
msgid "Credit"
msgstr "Crédit"
#: accounting/models.py:434
#: accounting/templates/accounting/journal_statement_nature.jinja:28
#: accounting/templates/accounting/journal_statement_person.jinja:40
-#: accounting/views.py:574
+#: accounting/views.py:566
msgid "Debit"
msgstr "Débit"
@@ -782,7 +782,7 @@ msgstr "Sauver"
#: accounting/templates/accounting/refound_account.jinja:4
#: accounting/templates/accounting/refound_account.jinja:9
-#: accounting/views.py:892
+#: accounting/views.py:884
msgid "Refound account"
msgstr "Remboursement de compte"
@@ -803,87 +803,87 @@ msgstr "Types simplifiés"
msgid "New simplified type"
msgstr "Nouveau type simplifié"
-#: accounting/views.py:215 accounting/views.py:225 accounting/views.py:549
+#: accounting/views.py:215 accounting/views.py:224 accounting/views.py:541
msgid "Journal"
msgstr "Classeur"
-#: accounting/views.py:235
+#: accounting/views.py:232
msgid "Statement by nature"
msgstr "Bilan par nature"
-#: accounting/views.py:245
+#: accounting/views.py:240
msgid "Statement by person"
msgstr "Bilan par personne"
-#: accounting/views.py:255
+#: accounting/views.py:248
msgid "Accounting statement"
msgstr "Bilan comptable"
-#: accounting/views.py:369
+#: accounting/views.py:361
msgid "Link this operation to the target account"
msgstr "Lier cette opération au compte cible"
-#: accounting/views.py:399
+#: accounting/views.py:391
msgid "The target must be set."
msgstr "La cible doit être indiquée."
-#: accounting/views.py:414
+#: accounting/views.py:406
msgid "The amount must be set."
msgstr "Le montant doit être indiqué."
-#: accounting/views.py:543 accounting/views.py:549
+#: accounting/views.py:535 accounting/views.py:541
msgid "Operation"
msgstr "Opération"
-#: accounting/views.py:558
+#: accounting/views.py:550
msgid "Financial proof: "
msgstr "Justificatif de libellé : "
-#: accounting/views.py:561
+#: accounting/views.py:553
#, python-format
msgid "Club: %(club_name)s"
msgstr "Club : %(club_name)s"
-#: accounting/views.py:566
+#: accounting/views.py:558
#, python-format
msgid "Label: %(op_label)s"
msgstr "Libellé : %(op_label)s"
-#: accounting/views.py:569
+#: accounting/views.py:561
#, python-format
msgid "Date: %(date)s"
msgstr "Date : %(date)s"
-#: accounting/views.py:577
+#: accounting/views.py:569
#, python-format
msgid "Amount: %(amount).2f €"
msgstr "Montant : %(amount).2f €"
-#: accounting/views.py:592
+#: accounting/views.py:584
msgid "Debtor"
msgstr "Débiteur"
-#: accounting/views.py:592
+#: accounting/views.py:584
msgid "Creditor"
msgstr "Créditeur"
-#: accounting/views.py:597
+#: accounting/views.py:589
msgid "Comment:"
msgstr "Commentaire :"
-#: accounting/views.py:622
+#: accounting/views.py:614
msgid "Signature:"
msgstr "Signature :"
-#: accounting/views.py:686
+#: accounting/views.py:678
msgid "General statement"
msgstr "Bilan général"
-#: accounting/views.py:693
+#: accounting/views.py:685
msgid "No label operations"
msgstr "Opérations sans étiquette"
-#: accounting/views.py:846
+#: accounting/views.py:838
msgid "Refound this account"
msgstr "Rembourser ce compte"
@@ -910,7 +910,7 @@ msgstr ""
msgid "Users to add"
msgstr "Utilisateurs à ajouter"
-#: club/forms.py:55 club/forms.py:181 core/views/group.py:42
+#: club/forms.py:55 club/forms.py:181 core/views/group.py:40
msgid "Search users to add (one or more)."
msgstr "Recherche les utilisateurs à ajouter (un ou plus)."
@@ -1025,11 +1025,11 @@ msgstr "actif"
msgid "short description"
msgstr "description courte"
-#: club/models.py:81 core/models.py:393
+#: club/models.py:81 core/models.py:358
msgid "address"
msgstr "Adresse"
-#: club/models.py:98 core/models.py:304
+#: club/models.py:98 core/models.py:269
msgid "home"
msgstr "home"
@@ -1046,20 +1046,20 @@ msgstr "Un club avec ce nom UNIX existe déjà."
#: launderette/models.py:130 launderette/models.py:184 sas/models.py:273
#: trombi/models.py:205
msgid "user"
-msgstr "nom d'utilisateur"
+msgstr "utilisateur"
-#: club/models.py:354 core/models.py:357 election/models.py:178
+#: club/models.py:354 core/models.py:322 election/models.py:178
#: election/models.py:212 trombi/models.py:210
msgid "role"
msgstr "rôle"
-#: club/models.py:359 core/models.py:90 counter/models.py:300
+#: club/models.py:359 core/models.py:84 counter/models.py:300
#: counter/models.py:331 election/models.py:13 election/models.py:115
#: election/models.py:188 forum/models.py:61 forum/models.py:245
msgid "description"
msgstr "description"
-#: club/models.py:415 club/models.py:511
+#: club/models.py:415 club/models.py:510
msgid "Email address"
msgstr "Adresse email"
@@ -1068,31 +1068,31 @@ msgid "Enter a valid address. Only the root of the address is needed."
msgstr ""
"Entrez une adresse valide. Seule la racine de l'adresse est nécessaire."
-#: club/models.py:427 com/models.py:97 com/models.py:324 core/models.py:955
+#: club/models.py:427 com/models.py:97 com/models.py:322 core/models.py:914
msgid "is moderated"
msgstr "est modéré"
-#: club/models.py:431 com/models.py:101 com/models.py:328
+#: club/models.py:431 com/models.py:101 com/models.py:326
msgid "moderator"
msgstr "modérateur"
-#: club/models.py:458
+#: club/models.py:457
msgid "This mailing list already exists."
msgstr "Cette liste de diffusion existe déjà."
-#: club/models.py:497 club/templates/club/mailing.jinja:23
+#: club/models.py:496 club/templates/club/mailing.jinja:23
msgid "Mailing"
msgstr "Liste de diffusion"
-#: club/models.py:521
+#: club/models.py:520
msgid "At least user or email is required"
msgstr "Au moins un utilisateur ou un email est nécessaire"
-#: club/models.py:529 club/tests.py:770
+#: club/models.py:528 club/tests.py:770
msgid "This email is already suscribed in this mailing"
msgstr "Cet email est déjà abonné à cette mailing"
-#: club/models.py:557
+#: club/models.py:556
msgid "Unregistered user"
msgstr "Utilisateur non enregistré"
@@ -1146,7 +1146,7 @@ msgid "There are no members in this club."
msgstr "Il n'y a pas de membres dans ce club."
#: club/templates/club/club_members.jinja:80
-#: core/templates/core/file_detail.jinja:19 core/views/forms.py:307
+#: core/templates/core/file_detail.jinja:19 core/views/forms.py:305
#: launderette/views.py:208 trombi/templates/trombi/detail.jinja:19
msgid "Add"
msgstr "Ajouter"
@@ -1426,7 +1426,7 @@ msgstr "Hebdomadaire"
msgid "Call"
msgstr "Appel"
-#: com/models.py:67 com/models.py:189 com/models.py:263
+#: com/models.py:67 com/models.py:187 com/models.py:261
#: core/templates/core/macros.jinja:301 election/models.py:12
#: election/models.py:114 election/models.py:152 forum/models.py:256
#: forum/models.py:310 pedagogy/models.py:97
@@ -1445,7 +1445,7 @@ msgstr ""
"Une description de l'évènement (quelle est l'activité ? Y a-t-il un clic "
"associé ? Y-a-t'il un formulaire d'inscription ?)"
-#: com/models.py:76 com/models.py:264 trombi/models.py:188
+#: com/models.py:76 com/models.py:262 trombi/models.py:188
msgid "content"
msgstr "contenu"
@@ -1453,7 +1453,7 @@ msgstr "contenu"
msgid "A more detailed and exhaustive description of the event."
msgstr "Une description plus détaillée et exhaustive de l'évènement."
-#: com/models.py:82 core/models.py:1508 launderette/models.py:88
+#: com/models.py:82 core/models.py:1465 launderette/models.py:88
#: launderette/models.py:124 launderette/models.py:167
msgid "type"
msgstr "type"
@@ -1462,60 +1462,60 @@ msgstr "type"
msgid "The club which organizes the event."
msgstr "Le club qui organise l'évènement."
-#: com/models.py:94 com/models.py:268 pedagogy/models.py:57
+#: com/models.py:94 com/models.py:266 pedagogy/models.py:57
#: pedagogy/models.py:200 trombi/models.py:178
msgid "author"
msgstr "auteur"
-#: com/models.py:168
+#: com/models.py:166
msgid "news_date"
msgstr "date de la nouvelle"
-#: com/models.py:171
+#: com/models.py:169
msgid "start_date"
msgstr "date de début"
-#: com/models.py:172
+#: com/models.py:170
msgid "end_date"
msgstr "date de fin"
-#: com/models.py:190
+#: com/models.py:188
msgid "intro"
msgstr "intro"
-#: com/models.py:191
+#: com/models.py:189
msgid "joke"
msgstr "blague"
-#: com/models.py:192
+#: com/models.py:190
msgid "protip"
msgstr "astuce"
-#: com/models.py:193
+#: com/models.py:191
msgid "conclusion"
msgstr "conclusion"
-#: com/models.py:194
+#: com/models.py:192
msgid "sent"
msgstr "envoyé"
-#: com/models.py:259
+#: com/models.py:257
msgid "weekmail"
msgstr "weekmail"
-#: com/models.py:277
+#: com/models.py:275
msgid "rank"
msgstr "rang"
-#: com/models.py:310 core/models.py:920 core/models.py:970
+#: com/models.py:308 core/models.py:879 core/models.py:929
msgid "file"
msgstr "fichier"
-#: com/models.py:322
+#: com/models.py:320
msgid "display time"
msgstr "temps d'affichage"
-#: com/models.py:353
+#: com/models.py:349
msgid "Begin date should be before end date"
msgstr "La date de début doit être avant celle de fin"
@@ -1766,7 +1766,7 @@ msgstr "Anniversaires"
msgid "%(age)s year old"
msgstr "%(age)s ans"
-#: com/templates/com/news_list.jinja:156 com/tests.py:103 com/tests.py:113
+#: com/templates/com/news_list.jinja:156 com/tests.py:101 com/tests.py:111
msgid "You need an up to date subscription to access this content"
msgstr "Votre cotisation doit être à jour pour accéder à cette section"
@@ -1976,253 +1976,211 @@ msgstr "Ce champ est obligatoire."
msgid "An event cannot end before its beginning."
msgstr "Un évènement ne peut pas se finir avant d'avoir commencé."
-#: com/views.py:449
+#: com/views.py:445
msgid "Delete and save to regenerate"
msgstr "Supprimer et sauver pour régénérer"
-#: com/views.py:464
+#: com/views.py:460
msgid "Weekmail of the "
msgstr "Weekmail du "
-#: com/views.py:568
+#: com/views.py:564
msgid ""
"You must be a board member of the selected club to post in the Weekmail."
msgstr ""
"Vous devez êtres un membre du bureau du club sélectionné pour poster dans le "
"Weekmail."
-#: core/models.py:85
+#: core/models.py:79
msgid "meta group status"
msgstr "status du meta-groupe"
-#: core/models.py:87
+#: core/models.py:81
msgid "Whether a group is a meta group or not"
msgstr "Si un groupe est un meta-groupe ou pas"
-#: core/models.py:173
+#: core/models.py:167
#, python-format
msgid "%(value)s is not a valid promo (between 0 and %(end)s)"
msgstr "%(value)s n'est pas une promo valide (doit être entre 0 et %(end)s)"
-#: core/models.py:257
-msgid "username"
-msgstr "nom d'utilisateur"
-
-#: core/models.py:261
-msgid "Required. 254 characters or fewer. Letters, digits and ./+/-/_ only."
-msgstr ""
-"Requis. Pas plus de 254 caractères. Uniquement des lettres, numéros, et ./"
-"+/-/_"
-
-#: core/models.py:267
-msgid ""
-"Enter a valid username. This value may contain only letters, numbers and ./"
-"+/-/_ characters."
-msgstr ""
-"Entrez un nom d'utilisateur correct. Uniquement des lettres, numéros, et ./"
-"+/-/_"
-
-#: core/models.py:273
-msgid "A user with that username already exists."
-msgstr "Un utilisateur de ce nom existe déjà"
-
-#: core/models.py:275
+#: core/models.py:250
msgid "first name"
msgstr "Prénom"
-#: core/models.py:276
+#: core/models.py:251
msgid "last name"
msgstr "Nom"
-#: core/models.py:277
+#: core/models.py:252
msgid "email address"
msgstr "adresse email"
-#: core/models.py:278
+#: core/models.py:253
msgid "date of birth"
msgstr "date de naissance"
-#: core/models.py:279
+#: core/models.py:254
msgid "nick name"
msgstr "surnom"
-#: core/models.py:281
-msgid "staff status"
-msgstr "status \"staff\""
-
-#: core/models.py:283
-msgid "Designates whether the user can log into this admin site."
-msgstr "Est-ce que l'utilisateur peut se logger à la partie admin du site."
-
-#: core/models.py:286
-msgid "active"
-msgstr "actif"
-
-#: core/models.py:289
-msgid ""
-"Designates whether this user should be treated as active. Unselect this "
-"instead of deleting accounts."
-msgstr ""
-"Est-ce que l'utilisateur doit être traité comme actif. Désélectionnez au "
-"lieu de supprimer les comptes."
-
-#: core/models.py:293
-msgid "date joined"
-msgstr "date d'inscription"
-
-#: core/models.py:294
+#: core/models.py:255
msgid "last update"
msgstr "dernière mise à jour"
-#: core/models.py:296
-msgid "superuser"
-msgstr "super-utilisateur"
+#: core/models.py:258
+msgid "groups"
+msgstr "groupes"
-#: core/models.py:298
-msgid "Designates whether this user is a superuser. "
-msgstr "Est-ce que l'utilisateur est super-utilisateur."
+#: core/models.py:260
+msgid ""
+"The groups this user belongs to. A user will get all permissions granted to "
+"each of their groups."
+msgstr ""
+"Les groupes auxquels cet utilisateur appartient. Un utilisateur aura toutes les "
+"permissions de chacun de ses groupes."
-#: core/models.py:312
+#: core/models.py:277
msgid "profile"
msgstr "profil"
-#: core/models.py:320
+#: core/models.py:285
msgid "avatar"
msgstr "avatar"
-#: core/models.py:328
+#: core/models.py:293
msgid "scrub"
msgstr "blouse"
-#: core/models.py:334
+#: core/models.py:299
msgid "sex"
msgstr "Genre"
-#: core/models.py:338
+#: core/models.py:303
msgid "Man"
msgstr "Homme"
-#: core/models.py:338
+#: core/models.py:303
msgid "Woman"
msgstr "Femme"
-#: core/models.py:340
+#: core/models.py:305
msgid "pronouns"
msgstr "pronoms"
-#: core/models.py:342
+#: core/models.py:307
msgid "tshirt size"
msgstr "taille de t-shirt"
-#: core/models.py:345
+#: core/models.py:310
msgid "-"
msgstr "-"
-#: core/models.py:346
+#: core/models.py:311
msgid "XS"
msgstr "XS"
-#: core/models.py:347
+#: core/models.py:312
msgid "S"
msgstr "S"
-#: core/models.py:348
+#: core/models.py:313
msgid "M"
msgstr "M"
-#: core/models.py:349
+#: core/models.py:314
msgid "L"
msgstr "L"
-#: core/models.py:350
+#: core/models.py:315
msgid "XL"
msgstr "XL"
-#: core/models.py:351
+#: core/models.py:316
msgid "XXL"
msgstr "XXL"
-#: core/models.py:352
+#: core/models.py:317
msgid "XXXL"
msgstr "XXXL"
-#: core/models.py:360
+#: core/models.py:325
msgid "Student"
msgstr "Étudiant"
-#: core/models.py:361
+#: core/models.py:326
msgid "Administrative agent"
msgstr "Personnel administratif"
-#: core/models.py:362
+#: core/models.py:327
msgid "Teacher"
msgstr "Enseignant"
-#: core/models.py:363
+#: core/models.py:328
msgid "Agent"
msgstr "Personnel"
-#: core/models.py:364
+#: core/models.py:329
msgid "Doctor"
msgstr "Doctorant"
-#: core/models.py:365
+#: core/models.py:330
msgid "Former student"
msgstr "Ancien étudiant"
-#: core/models.py:366
+#: core/models.py:331
msgid "Service"
msgstr "Service"
-#: core/models.py:372
+#: core/models.py:337
msgid "department"
msgstr "département"
-#: core/models.py:379
+#: core/models.py:344
msgid "dpt option"
msgstr "Filière"
-#: core/models.py:381 pedagogy/models.py:70 pedagogy/models.py:294
+#: core/models.py:346 pedagogy/models.py:70 pedagogy/models.py:294
msgid "semester"
msgstr "semestre"
-#: core/models.py:382
+#: core/models.py:347
msgid "quote"
msgstr "citation"
-#: core/models.py:383
+#: core/models.py:348
msgid "school"
msgstr "école"
-#: core/models.py:385
+#: core/models.py:350
msgid "promo"
msgstr "promo"
-#: core/models.py:388
+#: core/models.py:353
msgid "forum signature"
msgstr "signature du forum"
-#: core/models.py:390
+#: core/models.py:355
msgid "second email address"
msgstr "adresse email secondaire"
-#: core/models.py:392
+#: core/models.py:357
msgid "parent phone"
msgstr "téléphone des parents"
-#: core/models.py:395
+#: core/models.py:360
msgid "parent address"
msgstr "adresse des parents"
-#: core/models.py:398
+#: core/models.py:363
msgid "is subscriber viewable"
msgstr "profil visible par les cotisants"
-#: core/models.py:592
+#: core/models.py:556
msgid "A user with that username already exists"
msgstr "Un utilisateur de ce nom d'utilisateur existe déjà"
-#: core/models.py:759 core/templates/core/macros.jinja:80
+#: core/models.py:718 core/templates/core/macros.jinja:80
#: core/templates/core/macros.jinja:84 core/templates/core/macros.jinja:85
#: core/templates/core/user_detail.jinja:100
#: core/templates/core/user_detail.jinja:101
@@ -2242,101 +2200,101 @@ msgstr "Un utilisateur de ce nom d'utilisateur existe déjà"
msgid "Profile"
msgstr "Profil"
-#: core/models.py:870
+#: core/models.py:829
msgid "Visitor"
msgstr "Visiteur"
-#: core/models.py:877
+#: core/models.py:836
msgid "receive the Weekmail"
msgstr "recevoir le Weekmail"
-#: core/models.py:878
+#: core/models.py:837
msgid "show your stats to others"
msgstr "montrez vos statistiques aux autres"
-#: core/models.py:880
+#: core/models.py:839
msgid "get a notification for every click"
msgstr "avoir une notification pour chaque click"
-#: core/models.py:883
+#: core/models.py:842
msgid "get a notification for every refilling"
msgstr "avoir une notification pour chaque rechargement"
-#: core/models.py:909 sas/forms.py:81
+#: core/models.py:868 sas/forms.py:81
msgid "file name"
msgstr "nom du fichier"
-#: core/models.py:913 core/models.py:1266
+#: core/models.py:872 core/models.py:1223
msgid "parent"
msgstr "parent"
-#: core/models.py:927
+#: core/models.py:886
msgid "compressed file"
msgstr "version allégée"
-#: core/models.py:934
+#: core/models.py:893
msgid "thumbnail"
msgstr "miniature"
-#: core/models.py:942 core/models.py:959
+#: core/models.py:901 core/models.py:918
msgid "owner"
msgstr "propriétaire"
-#: core/models.py:946 core/models.py:1283
+#: core/models.py:905 core/models.py:1240
msgid "edit group"
msgstr "groupe d'édition"
-#: core/models.py:949 core/models.py:1286
+#: core/models.py:908 core/models.py:1243
msgid "view group"
msgstr "groupe de vue"
-#: core/models.py:951
+#: core/models.py:910
msgid "is folder"
msgstr "est un dossier"
-#: core/models.py:952
+#: core/models.py:911
msgid "mime type"
msgstr "type mime"
-#: core/models.py:953
+#: core/models.py:912
msgid "size"
msgstr "taille"
-#: core/models.py:964
+#: core/models.py:923
msgid "asked for removal"
msgstr "retrait demandé"
-#: core/models.py:966
+#: core/models.py:925
msgid "is in the SAS"
msgstr "est dans le SAS"
-#: core/models.py:1035
+#: core/models.py:992
msgid "Character '/' not authorized in name"
msgstr "Le caractère '/' n'est pas autorisé dans les noms de fichier"
-#: core/models.py:1037 core/models.py:1041
+#: core/models.py:994 core/models.py:998
msgid "Loop in folder tree"
msgstr "Boucle dans l'arborescence des dossiers"
-#: core/models.py:1044
+#: core/models.py:1001
msgid "You can not make a file be a children of a non folder file"
msgstr ""
"Vous ne pouvez pas mettre un fichier enfant de quelque chose qui n'est pas "
"un dossier"
-#: core/models.py:1055
+#: core/models.py:1012
msgid "Duplicate file"
msgstr "Un fichier de ce nom existe déjà"
-#: core/models.py:1072
+#: core/models.py:1029
msgid "You must provide a file"
msgstr "Vous devez fournir un fichier"
-#: core/models.py:1249
+#: core/models.py:1206
msgid "page unix name"
msgstr "nom unix de la page"
-#: core/models.py:1255
+#: core/models.py:1212
msgid ""
"Enter a valid page name. This value may contain only unaccented letters, "
"numbers and ./+/-/_ characters."
@@ -2344,55 +2302,55 @@ msgstr ""
"Entrez un nom de page correct. Uniquement des lettres non accentuées, "
"numéros, et ./+/-/_"
-#: core/models.py:1273
+#: core/models.py:1230
msgid "page name"
msgstr "nom de la page"
-#: core/models.py:1278
+#: core/models.py:1235
msgid "owner group"
msgstr "groupe propriétaire"
-#: core/models.py:1291
+#: core/models.py:1248
msgid "lock user"
msgstr "utilisateur bloquant"
-#: core/models.py:1298
+#: core/models.py:1255
msgid "lock_timeout"
msgstr "décompte du déblocage"
-#: core/models.py:1348
+#: core/models.py:1305
msgid "Duplicate page"
msgstr "Une page de ce nom existe déjà"
-#: core/models.py:1351
+#: core/models.py:1308
msgid "Loop in page tree"
msgstr "Boucle dans l'arborescence des pages"
-#: core/models.py:1462
+#: core/models.py:1419
msgid "revision"
msgstr "révision"
-#: core/models.py:1463
+#: core/models.py:1420
msgid "page title"
msgstr "titre de la page"
-#: core/models.py:1464
+#: core/models.py:1421
msgid "page content"
msgstr "contenu de la page"
-#: core/models.py:1505
+#: core/models.py:1462
msgid "url"
msgstr "url"
-#: core/models.py:1506
+#: core/models.py:1463
msgid "param"
msgstr "param"
-#: core/models.py:1511
+#: core/models.py:1468
msgid "viewed"
msgstr "vue"
-#: core/models.py:1569
+#: core/models.py:1526
msgid "operation type"
msgstr "type d'opération"
@@ -2543,7 +2501,7 @@ msgid "Launderette"
msgstr "Laverie"
#: core/templates/core/base/navbar.jinja:28 core/templates/core/file.jinja:24
-#: core/views/files.py:121
+#: core/views/files.py:122
msgid "Files"
msgstr "Fichiers"
@@ -3508,16 +3466,16 @@ msgid_plural "%(nb_days)d days, %(remainder)s"
msgstr[0] ""
msgstr[1] ""
-#: core/views/files.py:118
+#: core/views/files.py:119
msgid "Add a new folder"
msgstr "Ajouter un nouveau dossier"
-#: core/views/files.py:138
+#: core/views/files.py:139
#, python-format
msgid "Error creating folder %(folder_name)s: %(msg)s"
msgstr "Erreur de création du dossier %(folder_name)s : %(msg)s"
-#: core/views/files.py:158 core/views/forms.py:272 core/views/forms.py:279
+#: core/views/files.py:159 core/views/forms.py:270 core/views/forms.py:277
#: sas/forms.py:60
#, python-format
msgid "Error uploading file %(file_name)s: %(msg)s"
@@ -3539,7 +3497,7 @@ msgstr "Choisir un utilisateur"
msgid "Username, email, or account number"
msgstr "Nom d'utilisateur, email, ou numéro de compte AE"
-#: core/views/forms.py:222
+#: core/views/forms.py:220
msgid ""
"Profile: you need to be visible on the picture, in order to be recognized (e."
"g. by the barmen)"
@@ -3547,53 +3505,53 @@ msgstr ""
"Photo de profil: vous devez être visible sur la photo afin d'être reconnu "
"(par exemple par les barmen)"
-#: core/views/forms.py:227
+#: core/views/forms.py:225
msgid "Avatar: used on the forum"
msgstr "Avatar : utilisé sur le forum"
-#: core/views/forms.py:231
+#: core/views/forms.py:229
msgid "Scrub: let other know how your scrub looks like!"
msgstr "Blouse : montrez aux autres à quoi ressemble votre blouse !"
-#: core/views/forms.py:283
+#: core/views/forms.py:281
msgid "Bad image format, only jpeg, png, webp and gif are accepted"
msgstr "Mauvais format d'image, seuls les jpeg, png, webp et gif sont acceptés"
-#: core/views/forms.py:304
+#: core/views/forms.py:302
msgid "Godfather / Godmother"
msgstr "Parrain / Marraine"
-#: core/views/forms.py:305
+#: core/views/forms.py:303
msgid "Godchild"
msgstr "Fillot / Fillote"
-#: core/views/forms.py:310 counter/forms.py:78 trombi/views.py:151
+#: core/views/forms.py:308 counter/forms.py:78 trombi/views.py:151
msgid "Select user"
msgstr "Choisir un utilisateur"
-#: core/views/forms.py:324
+#: core/views/forms.py:322
msgid "This user does not exist"
msgstr "Cet utilisateur n'existe pas"
-#: core/views/forms.py:326
+#: core/views/forms.py:324
msgid "You cannot be related to yourself"
msgstr "Vous ne pouvez pas être relié à vous-même"
-#: core/views/forms.py:338
+#: core/views/forms.py:336
#, python-format
msgid "%s is already your godfather"
msgstr "%s est déjà votre parrain/marraine"
-#: core/views/forms.py:344
+#: core/views/forms.py:342
#, python-format
msgid "%s is already your godchild"
msgstr "%s est déjà votre fillot/fillote"
-#: core/views/group.py:41
+#: core/views/group.py:39
msgid "Users to add to group"
msgstr "Utilisateurs à ajouter au groupe"
-#: core/views/group.py:50
+#: core/views/group.py:48
msgid "Users to remove from group"
msgstr "Utilisateurs à retirer du groupe"
@@ -3649,10 +3607,6 @@ msgstr "Votre compte AE a été vidé"
msgid "Clearing of your AE account"
msgstr "Vidange de votre compte AE"
-#: counter/migrations/0013_customer_recorded_products.py:25
-msgid "Ecocup regularization"
-msgstr "Régularization des ecocups"
-
#: counter/models.py:92
msgid "account id"
msgstr "numéro de compte"
diff --git a/pedagogy/migrations/0002_auto_20190827_2251.py b/pedagogy/migrations/0002_auto_20190827_2251.py
index 2b1f4b36..7fbe05a8 100644
--- a/pedagogy/migrations/0002_auto_20190827_2251.py
+++ b/pedagogy/migrations/0002_auto_20190827_2251.py
@@ -25,26 +25,11 @@ from __future__ import unicode_literals
from django.db import migrations
-from core.models import User
-
-
-def remove_multiples_comments_from_same_user(apps, schema_editor):
- for user in User.objects.exclude(uv_comments=None).prefetch_related("uv_comments"):
- for uv in user.uv_comments.values("uv").distinct():
- last = (
- user.uv_comments.filter(uv__id=uv["uv"])
- .order_by("-publish_date")
- .first()
- )
- user.uv_comments.filter(uv__id=uv["uv"]).exclude(pk=last.pk).delete()
-
class Migration(migrations.Migration):
dependencies = [("pedagogy", "0001_initial")]
- operations = [
- migrations.RunPython(
- remove_multiples_comments_from_same_user,
- reverse_code=migrations.RunPython.noop,
- )
- ]
+ # This migration contained just a RunPython operation
+ # Which has since been removed.
+ # The migration itself is kept in order not to break the migration tree
+ operations = []
diff --git a/pedagogy/tests/test_api.py b/pedagogy/tests/test_api.py
index b8fb90b4..cbb99c18 100644
--- a/pedagogy/tests/test_api.py
+++ b/pedagogy/tests/test_api.py
@@ -8,7 +8,7 @@ from model_bakery import baker
from model_bakery.recipe import Recipe
from core.baker_recipes import subscriber_user
-from core.models import RealGroup, User
+from core.models import Group, User
from pedagogy.models import UV
@@ -80,9 +80,7 @@ class TestUVSearch(TestCase):
subscriber_user.make(),
baker.make(
User,
- groups=[
- RealGroup.objects.get(pk=settings.SITH_GROUP_PEDAGOGY_ADMIN_ID)
- ],
+ groups=[Group.objects.get(pk=settings.SITH_GROUP_PEDAGOGY_ADMIN_ID)],
),
):
# users that have right
diff --git a/pedagogy/views.py b/pedagogy/views.py
index ca2c712e..99dd8168 100644
--- a/pedagogy/views.py
+++ b/pedagogy/views.py
@@ -24,6 +24,7 @@
from django.conf import settings
from django.contrib.auth.mixins import LoginRequiredMixin
from django.core.exceptions import PermissionDenied
+from django.db.models import Exists, OuterRef
from django.shortcuts import get_object_or_404
from django.urls import reverse, reverse_lazy
from django.views.generic import (
@@ -34,7 +35,7 @@ from django.views.generic import (
UpdateView,
)
-from core.models import Notification, RealGroup
+from core.models import Notification, User
from core.views import (
CanCreateMixin,
CanEditPropMixin,
@@ -156,21 +157,19 @@ class UVCommentReportCreateView(CanCreateMixin, CreateView):
def form_valid(self, form):
resp = super().form_valid(form)
-
# Send a message to moderation admins
- for user in (
- RealGroup.objects.filter(id=settings.SITH_GROUP_PEDAGOGY_ADMIN_ID)
- .first()
- .users.all()
+ unread_notif_subquery = Notification.objects.filter(
+ user=OuterRef("pk"), type="PEDAGOGY_MODERATION", viewed=False
+ )
+ for user in User.objects.filter(
+ ~Exists(unread_notif_subquery),
+ groups__id__in=[settings.SITH_GROUP_PEDAGOGY_ADMIN_ID],
):
- if not user.notifications.filter(
- type="PEDAGOGY_MODERATION", viewed=False
- ).exists():
- Notification(
- user=user,
- url=reverse("pedagogy:moderation"),
- type="PEDAGOGY_MODERATION",
- ).save()
+ Notification.objects.create(
+ user=user,
+ url=reverse("pedagogy:moderation"),
+ type="PEDAGOGY_MODERATION",
+ )
return resp
diff --git a/rootplace/tests.py b/rootplace/tests.py
index 0d0f1542..a2bbee81 100644
--- a/rootplace/tests.py
+++ b/rootplace/tests.py
@@ -19,7 +19,7 @@ from django.urls import reverse
from django.utils.timezone import localtime, now
from club.models import Club
-from core.models import RealGroup, User
+from core.models import Group, User
from counter.models import Counter, Customer, Product, Refilling, Selling
from subscription.models import Subscription
@@ -50,9 +50,9 @@ class TestMergeUser(TestCase):
self.to_keep.address = "Jerusalem"
self.to_delete.parent_address = "Rome"
self.to_delete.address = "Rome"
- subscribers = RealGroup.objects.get(name="Subscribers")
- mde_admin = RealGroup.objects.get(name="MDE admin")
- sas_admin = RealGroup.objects.get(name="SAS admin")
+ subscribers = Group.objects.get(name="Subscribers")
+ mde_admin = Group.objects.get(name="MDE admin")
+ sas_admin = Group.objects.get(name="SAS admin")
self.to_keep.groups.add(subscribers.id)
self.to_delete.groups.add(mde_admin.id)
self.to_keep.groups.add(sas_admin.id)
diff --git a/sas/tests/test_api.py b/sas/tests/test_api.py
index 733838d2..9b24688b 100644
--- a/sas/tests/test_api.py
+++ b/sas/tests/test_api.py
@@ -7,7 +7,7 @@ from model_bakery import baker
from model_bakery.recipe import Recipe
from core.baker_recipes import old_subscriber_user, subscriber_user
-from core.models import RealGroup, SithFile, User
+from core.models import Group, SithFile, User
from sas.baker_recipes import picture_recipe
from sas.models import Album, PeoplePictureRelation, Picture, PictureModerationRequest
@@ -155,7 +155,7 @@ class TestPictureRelation(TestSas):
def test_delete_relation_with_authorized_users(self):
"""Test that deletion works as intended when called by an authorized user."""
relation: PeoplePictureRelation = self.user_a.pictures.first()
- sas_admin_group = RealGroup.objects.get(pk=settings.SITH_GROUP_SAS_ADMIN_ID)
+ sas_admin_group = Group.objects.get(pk=settings.SITH_GROUP_SAS_ADMIN_ID)
sas_admin = baker.make(User, groups=[sas_admin_group])
root = baker.make(User, is_superuser=True)
for user in sas_admin, root, self.user_a:
@@ -189,7 +189,7 @@ class TestPictureModeration(TestSas):
def setUpTestData(cls):
super().setUpTestData()
cls.sas_admin = baker.make(
- User, groups=[RealGroup.objects.get(pk=settings.SITH_GROUP_SAS_ADMIN_ID)]
+ User, groups=[Group.objects.get(pk=settings.SITH_GROUP_SAS_ADMIN_ID)]
)
cls.picture = Picture.objects.filter(parent=cls.album_a)[0]
cls.picture.is_moderated = False
diff --git a/sas/tests/test_views.py b/sas/tests/test_views.py
index 2a73b90b..ff8dd21d 100644
--- a/sas/tests/test_views.py
+++ b/sas/tests/test_views.py
@@ -23,7 +23,7 @@ from model_bakery import baker
from pytest_django.asserts import assertInHTML, assertRedirects
from core.baker_recipes import old_subscriber_user, subscriber_user
-from core.models import RealGroup, User
+from core.models import Group, User
from sas.baker_recipes import picture_recipe
from sas.models import Album, Picture
@@ -38,7 +38,7 @@ from sas.models import Album, Picture
old_subscriber_user.make,
lambda: baker.make(User, is_superuser=True),
lambda: baker.make(
- User, groups=[RealGroup.objects.get(pk=settings.SITH_GROUP_SAS_ADMIN_ID)]
+ User, groups=[Group.objects.get(pk=settings.SITH_GROUP_SAS_ADMIN_ID)]
),
lambda: baker.make(User),
],
@@ -80,7 +80,7 @@ class TestSasModeration(TestCase):
cls.to_moderate.is_moderated = False
cls.to_moderate.save()
cls.moderator = baker.make(
- User, groups=[RealGroup.objects.get(pk=settings.SITH_GROUP_SAS_ADMIN_ID)]
+ User, groups=[Group.objects.get(pk=settings.SITH_GROUP_SAS_ADMIN_ID)]
)
cls.simple_user = subscriber_user.make()