From 3991efeb9af75ad55ec373422da3c11ea2d36e6e Mon Sep 17 00:00:00 2001
From: Alban Gruin
Date: Mon, 27 Nov 2017 12:08:08 +0100
Subject: Les champs semestre et sous-groupe ne sont plus modifiables dans
l’interface d’administration
---
admin.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'admin.py')
diff --git a/admin.py b/admin.py
index 0235fb9..7739a95 100644
--- a/admin.py
+++ b/admin.py
@@ -49,7 +49,7 @@ class GroupAdmin(admin.ModelAdmin):
list_editable = ("hidden",)
list_filter = ("timetable",)
ordering = ("timetable",)
- readonly_fields = ("celcat_name", "mention",)
+ readonly_fields = ("celcat_name", "mention", "semester", "subgroup",)
actions = (make_hidden, make_visible,)
--
cgit v1.2.1
From 1b0fbf29a484b16de31ac5df1b3fded39be95e97 Mon Sep 17 00:00:00 2001
From: Alban Gruin
Date: Fri, 17 Nov 2017 21:20:37 +0100
Subject: Ajout d’un champ slug au modèle des salles
---
admin.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'admin.py')
diff --git a/admin.py b/admin.py
index 7739a95..011ad73 100644
--- a/admin.py
+++ b/admin.py
@@ -55,7 +55,7 @@ class GroupAdmin(admin.ModelAdmin):
@admin.register(Room)
class RoomAdmin(admin.ModelAdmin):
- pass
+ prepopulated_fields = {"slug": ("name",)}
@admin.register(Course)
--
cgit v1.2.1
From 582b1d2be865cc0fba9aa4726404f4370d0b80c5 Mon Sep 17 00:00:00 2001
From: Alban Gruin
Date: Sun, 19 Nov 2017 01:10:29 +0100
Subject: Séparation en deux modèles des emplois du temps : un pour
l’affichage, l’autre pour les sources
---
admin.py | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
(limited to 'admin.py')
diff --git a/admin.py b/admin.py
index 011ad73..717a386 100644
--- a/admin.py
+++ b/admin.py
@@ -14,7 +14,7 @@
# along with celcatsanitizer. If not, see .
from django.contrib import admin
-from .models import Timetable, Group, Room, Course, Year
+from .models import Course, Group, Room, Timetable, TimetableFront, Year
def make_hidden(modeladmin, request, queryset):
queryset.update(hidden=True)
@@ -34,8 +34,13 @@ class YearAdmin(admin.ModelAdmin):
@admin.register(Timetable)
class TimetableAdmin(admin.ModelAdmin):
+ list_display = ("url", "last_update_date",)
+
+
+@admin.register(TimetableFront)
+class TimetableFrontAdmin(admin.ModelAdmin):
prepopulated_fields = {"slug": ("name",)}
- list_display = ("name", "year", "url",)
+ list_display = ("name", "year", "source",)
list_filter = ("year__name",)
ordering = ("year", "name",)
--
cgit v1.2.1
From f729db8ed67f4540eb265e848bcd71add3ff074e Mon Sep 17 00:00:00 2001
From: Alban Gruin
Date: Mon, 27 Nov 2017 15:25:42 +0100
Subject: Renommage de Timetable en Source et de TimetableFront en Timetable.
C’est à partir de ce commit que la migration fournie sur la ML est
utilisable.
---
admin.py | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
(limited to 'admin.py')
diff --git a/admin.py b/admin.py
index 717a386..9d8a34f 100644
--- a/admin.py
+++ b/admin.py
@@ -14,7 +14,7 @@
# along with celcatsanitizer. If not, see .
from django.contrib import admin
-from .models import Course, Group, Room, Timetable, TimetableFront, Year
+from .models import Course, Group, Room, Source, Timetable, Year
def make_hidden(modeladmin, request, queryset):
queryset.update(hidden=True)
@@ -32,13 +32,13 @@ class YearAdmin(admin.ModelAdmin):
ordering = ("name",)
-@admin.register(Timetable)
-class TimetableAdmin(admin.ModelAdmin):
+@admin.register(Source)
+class SourceAdmin(admin.ModelAdmin):
list_display = ("url", "last_update_date",)
-@admin.register(TimetableFront)
-class TimetableFrontAdmin(admin.ModelAdmin):
+@admin.register(Timetable)
+class TimetableAdmin(admin.ModelAdmin):
prepopulated_fields = {"slug": ("name",)}
list_display = ("name", "year", "source",)
list_filter = ("year__name",)
--
cgit v1.2.1
From d0c69d3095d14f5509190d6b637cc0c018e53a19 Mon Sep 17 00:00:00 2001
From: Alban Gruin
Date: Mon, 27 Nov 2017 16:25:25 +0100
Subject: Changement des champs timetable en source pour plus de clareté
---
admin.py | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
(limited to 'admin.py')
diff --git a/admin.py b/admin.py
index 9d8a34f..fc0ada1 100644
--- a/admin.py
+++ b/admin.py
@@ -48,12 +48,12 @@ class TimetableAdmin(admin.ModelAdmin):
@admin.register(Group)
class GroupAdmin(admin.ModelAdmin):
fieldsets = (
- (None, {"fields": ("name", "celcat_name", "timetable", "hidden",)}),
+ (None, {"fields": ("name", "celcat_name", "source", "hidden",)}),
("Groupes", {"fields": ("mention", "semester", "subgroup",)}),)
- list_display = ("name", "timetable", "hidden",)
+ list_display = ("name", "source", "hidden",)
list_editable = ("hidden",)
- list_filter = ("timetable",)
- ordering = ("timetable",)
+ list_filter = ("source__timetables",)
+ ordering = ("name", "source",)
readonly_fields = ("celcat_name", "mention", "semester", "subgroup",)
actions = (make_hidden, make_visible,)
@@ -66,9 +66,9 @@ class RoomAdmin(admin.ModelAdmin):
@admin.register(Course)
class CourseAdmin(admin.ModelAdmin):
fieldsets = (
- (None, {"fields": ("name", "type", "timetable", "groups", "rooms", "last_update",)}),
+ (None, {"fields": ("name", "type", "source", "groups", "rooms", "last_update",)}),
("Horaires", {"fields": ("begin", "end",)}),
("Remarques", {"fields": ("notes",)}),)
- list_display = ("name", "type", "timetable", "begin", "end",)
- list_filter = ("type", "timetable", "groups",)
+ list_display = ("name", "type", "source", "begin", "end",)
+ list_filter = ("type", "source__timetables", "groups",)
ordering = ("begin",)
--
cgit v1.2.1
From 3b9eab819c603b1d3b2b59d79258ce6a05aa24b9 Mon Sep 17 00:00:00 2001
From: Alban Gruin
Date: Mon, 27 Nov 2017 16:34:27 +0100
Subject: Inversion des colonnes à trier pour le groupe dans l’interface
d’admin
---
admin.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'admin.py')
diff --git a/admin.py b/admin.py
index fc0ada1..5af6cb1 100644
--- a/admin.py
+++ b/admin.py
@@ -53,7 +53,7 @@ class GroupAdmin(admin.ModelAdmin):
list_display = ("name", "source", "hidden",)
list_editable = ("hidden",)
list_filter = ("source__timetables",)
- ordering = ("name", "source",)
+ ordering = ("source", "name",)
readonly_fields = ("celcat_name", "mention", "semester", "subgroup",)
actions = (make_hidden, make_visible,)
--
cgit v1.2.1
From c9388e29b2f9ee18a9e190683a8a33fb710684c5 Mon Sep 17 00:00:00 2001
From: Alban Gruin
Date: Sat, 27 Jan 2018 17:56:45 +0100
Subject: PEP8
---
admin.py | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
(limited to 'admin.py')
diff --git a/admin.py b/admin.py
index 5af6cb1..dcac794 100644
--- a/admin.py
+++ b/admin.py
@@ -16,10 +16,12 @@
from django.contrib import admin
from .models import Course, Group, Room, Source, Timetable, Year
+
def make_hidden(modeladmin, request, queryset):
queryset.update(hidden=True)
make_hidden.short_description = "Cacher les groupes sélectionnés"
+
def make_visible(modeladmin, request, queryset):
queryset.update(hidden=False)
make_visible.short_description = "Afficher les groupes sélectionnés"
@@ -66,7 +68,8 @@ class RoomAdmin(admin.ModelAdmin):
@admin.register(Course)
class CourseAdmin(admin.ModelAdmin):
fieldsets = (
- (None, {"fields": ("name", "type", "source", "groups", "rooms", "last_update",)}),
+ (None, {"fields": ("name", "type", "source", "groups", "rooms",
+ "last_update",)}),
("Horaires", {"fields": ("begin", "end",)}),
("Remarques", {"fields": ("notes",)}),)
list_display = ("name", "type", "source", "begin", "end",)
--
cgit v1.2.1
From 77a4b75431cfab7348db73b563dd005ce64be14a Mon Sep 17 00:00:00 2001
From: Alban Gruin
Date: Sun, 28 Jan 2018 11:14:34 +0100
Subject: Changements dans le formatage du code pour le rendre plus lisible
---
admin.py | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
(limited to 'admin.py')
diff --git a/admin.py b/admin.py
index dcac794..def84f0 100644
--- a/admin.py
+++ b/admin.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2017 Alban Gruin
+# Copyright (C) 2017-2018 Alban Gruin
#
# celcatsanitizer is free software: you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License as published
@@ -19,11 +19,13 @@ from .models import Course, Group, Room, Source, Timetable, Year
def make_hidden(modeladmin, request, queryset):
queryset.update(hidden=True)
-make_hidden.short_description = "Cacher les groupes sélectionnés"
def make_visible(modeladmin, request, queryset):
queryset.update(hidden=False)
+
+
+make_hidden.short_description = "Cacher les groupes sélectionnés"
make_visible.short_description = "Afficher les groupes sélectionnés"
--
cgit v1.2.1