Merge branch 'master' into new-address

.pre-commit-config.yaml

@@ -1,14 +1,14 @@
 repos:
   - repo: "https://github.com/ambv/black"
-    rev: "stable"
+    rev: "21.4b2"
     hooks:
     - id: "black"
       language_version: "python3"
-  - repo: "https://github.com/pre-commit/pre-commit-hooks"
-    rev: "v2.3.0"
+  - repo: "https://gitlab.com/pycqa/flake8"
+    rev: "3.9.1"
     hooks:
     - id: "flake8"
   - repo: "https://github.com/pre-commit/mirrors-isort"
-    rev: "v4.3.21"
+    rev: "v5.8.0"
     hooks:
     - id: "isort"

src/info/admin.py

@@ -6,6 +6,7 @@ from .models import InfoCategory, InfoItem
 
 @admin.register(InfoItem)
 class InfoItemAdmin(VersionAdmin):
+    save_as = True
     list_filter = ["category", "category__team__camp"]
     list_display = ["headline"]
 
@@ -17,7 +18,8 @@ class InfoItemInlineAdmin(admin.StackedInline):
 
 
 @admin.register(InfoCategory)
-class InfoCategorydmin(admin.ModelAdmin):
+class InfoCategoryAdmin(admin.ModelAdmin):
+    save_as = True
     list_filter = ["team__camp"]
     list_display = ["headline"]
     search_fields = ["headline", "body"]

src/templates/base.html

@@ -81,8 +81,8 @@
             <li class="dropdown">
               <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">Camps<span class="caret"></span></a>
               <ul class="dropdown-menu">
+                <li><a href="{% url 'camp_detail' camp_slug='bornhack-2021' %}">BornHack 2021</a></li>
                 <li><a href="{% url 'camp_detail' camp_slug='bornhack-2020' %}">BornHack 2020</a></li>
-                <li><a href="{% url 'camp_detail' camp_slug='bornhack-2019' %}">BornHack 2019</a></li>
                 <li role="separator" class="divider"></li>
                 <li><a href="{% url 'camp_list' %}">Camp List</a></li>
               </ul>