rezometz/re2o
8
0
Fork 0
mirror of https://gitlab2.federez.net/re2o/re2o synced 2024-12-23 23:43:47 +00:00
Code Issues Releases Wiki Activity

add BanType in admin site

Browse source
This commit is contained in:
Daniel STAN 2017-10-11 21:58:36 +02:00
parent 4c23daa477
commit 5b96a94774
2 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
users/admin.py
View file

@ -28,7 +28,7 @@ from django.contrib.auth.models import Group
from django.contrib.auth.admin import UserAdmin as BaseUserAdmin from django.contrib.auth.admin import UserAdmin as BaseUserAdmin
from reversion.admin import VersionAdmin from reversion.admin import VersionAdmin
from .models import User, ServiceUser, School, Right, ListRight, ListShell, Ban, Whitelist, Request, LdapUser, LdapServiceUser, LdapServiceUserGroup, LdapUserGroup from .models import User, ServiceUser, School, Right, ListRight, ListShell, BanType, Ban, Whitelist, Request, LdapUser, LdapServiceUser, LdapServiceUserGroup, LdapUserGroup
from .forms import UserChangeForm, UserCreationForm, ServiceUserChangeForm, ServiceUserCreationForm from .forms import UserChangeForm, UserCreationForm, ServiceUserChangeForm, ServiceUserCreationForm
@ -82,6 +82,8 @@ class RequestAdmin(admin.ModelAdmin):
class BanAdmin(VersionAdmin): class BanAdmin(VersionAdmin):
list_display = ('user', 'raison', 'date_start', 'date_end') list_display = ('user', 'raison', 'date_start', 'date_end')
class BanTypeAdmin(VersionAdmin):
list_display = ('name', 'description')
class WhitelistAdmin(VersionAdmin): class WhitelistAdmin(VersionAdmin):
list_display = ('user', 'raison', 'date_start', 'date_end') list_display = ('user', 'raison', 'date_start', 'date_end')
@ -151,6 +153,7 @@ admin.site.register(Right, RightAdmin)
admin.site.register(ListRight, ListRightAdmin) admin.site.register(ListRight, ListRightAdmin)
admin.site.register(ListShell, ListShellAdmin) admin.site.register(ListShell, ListShellAdmin)
admin.site.register(Ban, BanAdmin) admin.site.register(Ban, BanAdmin)
admin.site.register(BanType, BanTypeAdmin)
admin.site.register(Whitelist, WhitelistAdmin) admin.site.register(Whitelist, WhitelistAdmin)
admin.site.register(Request, RequestAdmin) admin.site.register(Request, RequestAdmin)
# Now register the new UserAdmin... # Now register the new UserAdmin...

7
users/models.py
View file

@ -737,8 +737,7 @@ class BanType(models.Model):
class Ban(models.Model): class Ban(models.Model):
""" Bannissement. Actuellement a un effet tout ou rien. """ Bannissement d'un utilisateur donné pour un motif/effet fourni."""
Gagnerait à être granulaire"""
PRETTY_NAME = "Liste des bannissements" PRETTY_NAME = "Liste des bannissements"
user = models.ForeignKey('User', on_delete=models.PROTECT) user = models.ForeignKey('User', on_delete=models.PROTECT)
@ -748,7 +747,9 @@ class Ban(models.Model):
ban_type = models.ForeignKey(BanType) ban_type = models.ForeignKey(BanType)
def notif_ban(self): def notif_ban(self):
""" Prend en argument un objet ban, envoie un mail de notification """ """ Prend en argument un objet ban, envoie un mail de notification.
À terme, il serait envisageable de déporter cette méthode sur le modèle
BanType afin de fournir un message différent suivant le type de Ban."""
general_options, created = GeneralOption.objects.get_or_create() general_options, created = GeneralOption.objects.get_or_create()
t = loader.get_template('users/email_ban_notif') t = loader.get_template('users/email_ban_notif')
options, created = AssoOption.objects.get_or_create() options, created = AssoOption.objects.get_or_create()