Merge branch 'stable/0.10.z' into prod/pa1ch/0.y.zv0.10.0-pa1ch

1 files changed, 14 insertions, 10 deletions

diff --git a/admin.py b/admin.py
index 16e34f3..e17948a 100644
--- a/admin.py
+++ b/admin.py
@@ -14,7 +14,15 @@
 #    along with celcatsanitizer.  If not, see <http://www.gnu.org/licenses/>.
 
 from django.contrib import admin
-from .models import Timetable, LastUpdate, Group, Room, Course, Year
+from .models import Timetable, Group, Room, Course, 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"
 
 
 @admin.register(Year)
@@ -32,21 +40,17 @@ class TimetableAdmin(admin.ModelAdmin):
     ordering = ("year", "name",)
 
 
-@admin.register(LastUpdate)
-class LastUpdateAdmin(admin.ModelAdmin):
-    list_display = ("timetable", "week", "year", "date", "updated_at",)
-    list_filter = ("timetable__name",)
-
-
 @admin.register(Group)
 class GroupAdmin(admin.ModelAdmin):
     fieldsets = (
-        (None, {"fields": ("name", "celcat_name", "timetable",)}),
+        (None, {"fields": ("name", "celcat_name", "timetable", "hidden",)}),
         ("Groupes", {"fields": ("mention", "subgroup", "td", "tp", "parent",)}),)
-    list_display = ("name", "timetable",)
+    list_display = ("name", "timetable", "hidden",)
+    list_editable = ("hidden",)
     list_filter = ("timetable",)
     ordering = ("timetable",)
     readonly_fields = ("celcat_name", "mention", "subgroup", "td", "tp",)
+    actions = (make_hidden, make_visible,)
 
 
 @admin.register(Room)
@@ -57,7 +61,7 @@ class RoomAdmin(admin.ModelAdmin):
 @admin.register(Course)
 class CourseAdmin(admin.ModelAdmin):
     fieldsets = (
-        (None, {"fields": ("name", "type", "timetable", "groups", "rooms",)}),
+        (None, {"fields": ("name", "type", "timetable", "groups", "rooms", "last_update",)}),
         ("Horaires", {"fields": ("begin", "end",)}),
         ("Remarques", {"fields": ("notes",)}),)
     list_display = ("name", "type", "timetable", "begin", "end",)