Merge branch 'stable/0.9.z' into prod/pa1ch/0.y.z

1 files changed, 16 insertions, 16 deletions

diff --git a/admin.py b/admin.py
index 2408623..2fc0e78 100644
--- a/admin.py
+++ b/admin.py
@@ -1,32 +1,38 @@
 #    Copyright (C) 2017  Alban Gruin
 #
-#    celcatsanitizer is free software; you can redistribute it and/or modify
-#    it under the terms of the GNU General Public License as published by
-#    the Free Software Foundation; either version 2 of the License, or
+#    celcatsanitizer is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU Affero General Public License as published
+#    by the Free Software Foundation, either version 3 of the License, or
 #    (at your option) any later version.
 #
 #    celcatsanitizer is distributed in the hope that it will be useful,
 #    but WITHOUT ANY WARRANTY; without even the implied warranty of
 #    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU General Public License for more details.
+#    GNU Affero General Public License for more details.
 #
-#    You should have received a copy of the GNU General Public License along
-#    with celcatsanitizer; if not, write to the Free Software Foundation, Inc.,
-#    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+#    You should have received a copy of the GNU Affero General Public License
+#    along with celcatsanitizer.  If not, see <http://www.gnu.org/licenses/>.
 
 from django.contrib import admin
-from .models import Timetable, LastUpdate, Group, Subscription, Room, Course
+from .models import Timetable, LastUpdate, Group, Room, Course, Year
+
+
+@admin.register(Year)
+class YearAdmin(admin.ModelAdmin):
+    prepopulated_fields = {"slug": ("name",)}
+    list_display = ("name",)
 
 
 @admin.register(Timetable)
 class TimetableAdmin(admin.ModelAdmin):
     prepopulated_fields = {"slug": ("name",)}
-    list_display = ("name", "url",)
+    list_display = ("name", "year", "url",)
+    list_filter = ("year__name",)
 
 
 @admin.register(LastUpdate)
 class LastUpdateAdmin(admin.ModelAdmin):
-    list_display = ("timetable", "week", "year", "date",)
+    list_display = ("timetable", "week", "year", "date", "updated_at",)
     list_filter = ("timetable__name",)
 
 
@@ -40,12 +46,6 @@ class GroupAdmin(admin.ModelAdmin):
     readonly_fields = ("celcat_name", "mention", "subgroup", "td", "tp",)
 
 
-@admin.register(Subscription)
-class SubscriptionAdmin(admin.ModelAdmin):
-    list_display = ("email", "group", "active",)
-    readonly_fields = ("token",)
-
-
 @admin.register(Room)
 class RoomAdmin(admin.ModelAdmin):
     pass