ynerant
/
nk20
mirror of https://gitlab.crans.org/bde/nk20
1
0
Fork 0
Code Issues Releases Wiki Activity

Linters

This commit is contained in:
Yohann D'ANELLO 2020-05-29 21:43:24 +02:00
parent f567b1a343
commit a9ccf46010
3 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
apps/note/models/transactions.py
View File

@ -1,6 +1,6 @@
# Copyright (C) 2018-2020 by BDE ENS Paris-Saclay # Copyright (C) 2018-2020 by BDE ENS Paris-Saclay
# SPDX-License-Identifier: GPL-3.0-or-later # SPDX-License-Identifier: GPL-3.0-or-later
from django.core.exceptions import ValidationError
from django.db import models from django.db import models
from django.urls import reverse from django.urls import reverse
from django.utils import timezone from django.utils import timezone
@ -273,7 +273,8 @@ class SpecialTransaction(Transaction):
def clean(self): def clean(self):
# SpecialTransaction are only possible with NoteSpecial object # SpecialTransaction are only possible with NoteSpecial object
if self.is_credit() == self.is_debit(): if self.is_credit() == self.is_debit():
raise(ValidationError(_("A special transaction is only possible between a Note associated to a payment method and a User or a Club"))) raise(ValidationError(_("A special transaction is only possible between a"
" Note associated to a payment method and a User or a Club")))
class MembershipTransaction(Transaction): class MembershipTransaction(Transaction):

5
apps/permission/backends.py
View File

@ -3,6 +3,7 @@
import datetime import datetime
from django.conf import settings
from django.contrib.auth.backends import ModelBackend from django.contrib.auth.backends import ModelBackend
from django.contrib.auth.models import User, AnonymousUser from django.contrib.auth.models import User, AnonymousUser
from django.contrib.contenttypes.models import ContentType from django.contrib.contenttypes.models import ContentType
@ -52,9 +53,9 @@ class PermissionBackend(ModelBackend):
& Q(mask__rank__lte=get_current_session().get("permission_mask", 0)) & Q(mask__rank__lte=get_current_session().get("permission_mask", 0))
) )
try: if settings.DATABASES[qs.db]["ENGINE"] == 'django.db.backends.postgresql_psycopg2':
qs = qs.distinct('pk', 'club') qs = qs.distinct('pk', 'club')
except: # SQLite doesn't support distinct fields. else: # SQLite doesn't support distinct fields.
qs = qs.distinct() qs = qs.distinct()
return qs return qs

3
apps/wei/management/commands/export_wei_registrations.py
View File

@ -4,7 +4,6 @@
from django.core.management import BaseCommand, CommandError from django.core.management import BaseCommand, CommandError
from django.db.models import Q from django.db.models import Q
from django.db.models.functions import Lower from django.db.models.functions import Lower
from wei.models import WEIClub, Bus, BusTeam, WEIMembership from wei.models import WEIClub, Bus, BusTeam, WEIMembership
@ -65,7 +64,7 @@ class Command(BaseCommand):
if team is not None: if team is not None:
qs = qs.filter(team=team if team else None) qs = qs.filter(team=team if team else None)
sep = options["sep"] sep = options["sep"]
self.stdout.write("Nom|Prénom|Date de naissance|Genre|Département|Année|Section|Bus|Équipe|Rôles" self.stdout.write("Nom|Prénom|Date de naissance|Genre|Département|Année|Section|Bus|Équipe|Rôles"