From d7dbf458b9797c23d66b7cdf75a50749a446b472 Mon Sep 17 00:00:00 2001
From: Tom Teichler <tom.teichler@teckids.org>
Date: Thu, 30 Apr 2020 21:40:35 +0200
Subject: [PATCH] Drop School stuff
---
aleksis/core/forms.py | 21 +-------
aleksis/core/templates/core/edit_school.html | 18 -------
.../core/templates/core/edit_schoolterm.html | 19 -------
.../templates/core/school_management.html | 12 -----
aleksis/core/util/core_helpers.py | 3 +-
aleksis/core/views.py | 50 +------------------
6 files changed, 3 insertions(+), 120 deletions(-)
delete mode 100644 aleksis/core/templates/core/edit_school.html
delete mode 100644 aleksis/core/templates/core/edit_schoolterm.html
delete mode 100644 aleksis/core/templates/core/school_management.html
diff --git a/aleksis/core/forms.py b/aleksis/core/forms.py
index 962766c4b..0fb1187eb 100644
--- a/aleksis/core/forms.py
+++ b/aleksis/core/forms.py
@@ -12,7 +12,7 @@ from django_select2.forms import ModelSelect2MultipleWidget, Select2Widget
from material import Layout, Fieldset, Row
from .mixins import ExtensibleForm
-from .models import Group, Person, School, SchoolTerm, Announcement, AnnouncementRecipient
+from .models import Group, Person, Announcement, AnnouncementRecipient
class PersonAccountForm(forms.ModelForm):
@@ -155,25 +155,6 @@ class EditGroupForm(ExtensibleForm):
}
-class EditSchoolForm(ExtensibleForm):
- layout = Layout(
- Fieldset(_("School name"), "name", "name_official"),
- Fieldset(_("School logo"), Row("logo", "logo_cropping")),
- )
-
- class Meta:
- model = School
- fields = ["name", "name_official", "logo", "logo_cropping"]
-
-
-class EditTermForm(ExtensibleForm):
- layout = Layout("caption", Row("date_start", "date_end"))
-
- class Meta:
- model = SchoolTerm
- fields = ["caption", "date_start", "date_end"]
-
-
class AnnouncementForm(ExtensibleForm):
valid_from = forms.DateTimeField(required=False)
valid_until = forms.DateTimeField(required=False)
diff --git a/aleksis/core/templates/core/edit_school.html b/aleksis/core/templates/core/edit_school.html
deleted file mode 100644
index 11eeaf001..000000000
--- a/aleksis/core/templates/core/edit_school.html
+++ /dev/null
@@ -1,18 +0,0 @@
-{# -*- engine:django -*- #}
-
-{% extends "core/base.html" %}
-
-{% load material_form i18n %}
-
-
-{% block browser_title %}{% blocktrans %}Edit school{% endblocktrans %}{% endblock %}
-{% block page_title %}{% blocktrans %}Edit school{% endblocktrans %}{% endblock %}
-
-
-{% block content %}
- <form method="post" enctype="multipart/form-data">
- {% csrf_token %}
- {% form form=edit_school_form %}{% endform %}
- {% include "core/save_button.html" %}
- </form>
-{% endblock %}
diff --git a/aleksis/core/templates/core/edit_schoolterm.html b/aleksis/core/templates/core/edit_schoolterm.html
deleted file mode 100644
index 8b5c0b98b..000000000
--- a/aleksis/core/templates/core/edit_schoolterm.html
+++ /dev/null
@@ -1,19 +0,0 @@
-{# -*- engine:django -*- #}
-
-{% extends "core/base.html" %}
-
-{% load material_form i18n %}
-
-
-{% block browser_title %}{% blocktrans %}Edit school term{% endblocktrans %}{% endblock %}
-{% block page_title %}{% blocktrans %}Edit school term{% endblocktrans %}{% endblock %}
-
-{% block content %}
-
- <form method="post">
- {% csrf_token %}
- {% form form=edit_term_form %}{% endform %}
- {% include "core/save_button.html" %}
- </form>
-
-{% endblock %}
diff --git a/aleksis/core/templates/core/school_management.html b/aleksis/core/templates/core/school_management.html
deleted file mode 100644
index 10fa00621..000000000
--- a/aleksis/core/templates/core/school_management.html
+++ /dev/null
@@ -1,12 +0,0 @@
-{# -*- engine:django -*- #}
-{% extends "core/base.html" %}
-{% load i18n menu_generator %}
-
-
-{% block browser_title %}{% blocktrans %}School management{% endblocktrans %}{% endblock %}
-{% block page_title %}{% blocktrans %}School management{% endblocktrans %}{% endblock %}
-
-{% block content %}
- {% get_menu "SCHOOL_MANAGEMENT_MENU" as menu %}
- {% include "core/on_page_menu.html" %}
-{% endblock %}
diff --git a/aleksis/core/util/core_helpers.py b/aleksis/core/util/core_helpers.py
index 7a567e94f..36776507f 100644
--- a/aleksis/core/util/core_helpers.py
+++ b/aleksis/core/util/core_helpers.py
@@ -165,9 +165,8 @@ def path_and_rename(instance, filename: str, upload_to: str = "files") -> str:
def custom_information_processor(request: HttpRequest) -> dict:
""" Provides custom information in all templates """
- from ..models import School, CustomMenu
+ from ..models import CustomMenu
return {
- "SCHOOL": School.get_default,
"FOOTER_MENU": CustomMenu.get_default("footer"),
}
diff --git a/aleksis/core/views.py b/aleksis/core/views.py
index 29bff15c9..4f5043006 100644
--- a/aleksis/core/views.py
+++ b/aleksis/core/views.py
@@ -20,13 +20,11 @@ from .filters import GroupFilter
from .forms import (
EditGroupForm,
EditPersonForm,
- EditSchoolForm,
- EditTermForm,
PersonsAccountsFormSet,
AnnouncementForm,
ChildGroupsForm,
)
-from .models import Activity, Group, Notification, Person, School, DashboardWidget, Announcement
+from .models import Activity, Group, Notification, Person, DashboardWidget, Announcement
from .tables import GroupsTable, PersonsTable
from .util import messages
from .util.apps import AppConfig
@@ -284,52 +282,6 @@ def system_status(request: HttpRequest) -> HttpResponse:
return render(request, "core/system_status.html", context)
-@permission_required("core.manage_school")
-def school_management(request: HttpRequest) -> HttpResponse:
- context = {}
- return render(request, "core/school_management.html", context)
-
-
-@permission_required("core.edit_school_information")
-def edit_school(request: HttpRequest) -> HttpResponse:
- context = {}
-
- school = School.objects.first()
- edit_school_form = EditSchoolForm(request.POST or None, request.FILES or None, instance=school)
-
- context["school"] = school
-
- if request.method == "POST":
- if edit_school_form.is_valid():
- edit_school_form.save(commit=True)
-
- messages.success(request, _("The school has been saved."))
- return redirect("index")
-
- context["edit_school_form"] = edit_school_form
-
- return render(request, "core/edit_school.html", context)
-
-
-@permission_required("core.edit_schoolterm")
-def edit_schoolterm(request: HttpRequest) -> HttpResponse:
- context = {}
-
- term = School.objects.first().current_term
- edit_term_form = EditTermForm(request.POST or None, instance=term)
-
- if request.method == "POST":
- if edit_term_form.is_valid():
- edit_term_form.save(commit=True)
-
- messages.success(request, _("The term has been saved."))
- return redirect("index")
-
- context["edit_term_form"] = edit_term_form
-
- return render(request, "core/edit_schoolterm.html", context)
-
-
def notification_mark_read(request: HttpRequest, id_: int) -> HttpResponse:
context = {}
--
GitLab