From 29e6fe82745f270a6b01132d3102191c92e71f3a Mon Sep 17 00:00:00 2001
From: Jonathan Weth <git@jonathanweth.de>
Date: Thu, 6 Jul 2023 22:09:45 +0200
Subject: [PATCH] Drop old management views for school terms
---
aleksis/core/forms.py | 11 ------
aleksis/core/tables.py | 18 ---------
.../templates/core/school_term/create.html | 17 ---------
.../core/templates/core/school_term/edit.html | 17 ---------
.../core/templates/core/school_term/list.html | 18 ---------
aleksis/core/urls.py | 11 ------
aleksis/core/views.py | 37 -------------------
7 files changed, 129 deletions(-)
delete mode 100644 aleksis/core/templates/core/school_term/create.html
delete mode 100644 aleksis/core/templates/core/school_term/edit.html
delete mode 100644 aleksis/core/templates/core/school_term/list.html
diff --git a/aleksis/core/forms.py b/aleksis/core/forms.py
index c6c15e764..e26390e7f 100644
--- a/aleksis/core/forms.py
+++ b/aleksis/core/forms.py
@@ -32,7 +32,6 @@ from .models import (
OAuthApplication,
Person,
PersonInvitation,
- SchoolTerm,
)
from .registries import (
group_preferences_registry,
@@ -379,16 +378,6 @@ class EditGroupTypeForm(forms.ModelForm):
fields = ["name", "description"]
-class SchoolTermForm(ExtensibleForm):
- """Form for managing school years."""
-
- layout = Layout("name", Row("date_start", "date_end"))
-
- class Meta:
- model = SchoolTerm
- fields = ["name", "date_start", "date_end"]
-
-
class DashboardWidgetOrderForm(ExtensibleForm):
pk = forms.ModelChoiceField(
queryset=None,
diff --git a/aleksis/core/tables.py b/aleksis/core/tables.py
index 5411cad47..8963981bb 100644
--- a/aleksis/core/tables.py
+++ b/aleksis/core/tables.py
@@ -10,24 +10,6 @@ from .models import Person
from .util.core_helpers import get_site_preferences
-class SchoolTermTable(tables.Table):
- """Table to list persons."""
-
- class Meta:
- attrs = {"class": "highlight"}
-
- name = tables.LinkColumn("edit_school_term", args=[A("id")])
- date_start = tables.Column()
- date_end = tables.Column()
- edit = tables.LinkColumn(
- "edit_school_term",
- args=[A("id")],
- text=_("Edit"),
- attrs={"a": {"class": "btn-flat waves-effect waves-orange orange-text"}},
- verbose_name=_("Actions"),
- )
-
-
class PersonsTable(tables.Table):
"""Table to list persons."""
diff --git a/aleksis/core/templates/core/school_term/create.html b/aleksis/core/templates/core/school_term/create.html
deleted file mode 100644
index a3e049112..000000000
--- a/aleksis/core/templates/core/school_term/create.html
+++ /dev/null
@@ -1,17 +0,0 @@
-{# -*- engine:django -*- #}
-
-{% extends "core/base.html" %}
-{% load material_form i18n %}
-
-{% block browser_title %}{% blocktrans %}Create school term{% endblocktrans %}{% endblock %}
-{% block page_title %}{% blocktrans %}Create school term{% endblocktrans %}{% endblock %}
-
-{% block content %}
-
- <form method="post">
- {% csrf_token %}
- {% form form=form %}{% endform %}
- {% include "core/partials/save_button.html" %}
- </form>
-
-{% endblock %}
diff --git a/aleksis/core/templates/core/school_term/edit.html b/aleksis/core/templates/core/school_term/edit.html
deleted file mode 100644
index aa1b1dcf5..000000000
--- a/aleksis/core/templates/core/school_term/edit.html
+++ /dev/null
@@ -1,17 +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=form %}{% endform %}
- {% include "core/partials/save_button.html" %}
- </form>
-
-{% endblock %}
diff --git a/aleksis/core/templates/core/school_term/list.html b/aleksis/core/templates/core/school_term/list.html
deleted file mode 100644
index 9df6af972..000000000
--- a/aleksis/core/templates/core/school_term/list.html
+++ /dev/null
@@ -1,18 +0,0 @@
-{# -*- engine:django -*- #}
-
-{% extends "core/base.html" %}
-
-{% load i18n %}
-{% load render_table from django_tables2 %}
-
-{% block browser_title %}{% blocktrans %}School terms{% endblocktrans %}{% endblock %}
-{% block page_title %}{% blocktrans %}School terms{% endblocktrans %}{% endblock %}
-
-{% block content %}
- <a class="btn green waves-effect waves-light" href="{% url 'create_school_term' %}">
- <i class="material-icons left iconify" data-icon="mdi:add"></i>
- {% trans "Create school term" %}
- </a>
-
- {% render_table table %}
-{% endblock %}
diff --git a/aleksis/core/urls.py b/aleksis/core/urls.py
index 7a22c7bb2..a79562f9b 100644
--- a/aleksis/core/urls.py
+++ b/aleksis/core/urls.py
@@ -96,17 +96,6 @@ urlpatterns = [
views.TwoFactorSetupView.as_view(),
name="setup_two_factor_auth",
),
- path("school_terms/", views.SchoolTermListView.as_view(), name="school_terms"),
- path(
- "school_terms/create/",
- views.SchoolTermCreateView.as_view(),
- name="create_school_term",
- ),
- path(
- "school_terms/<int:pk>/",
- views.SchoolTermEditView.as_view(),
- name="edit_school_term",
- ),
path("persons/", views.persons, name="persons"),
path(
"person/", TemplateView.as_view(template_name="core/empty.html"), name="person"
diff --git a/aleksis/core/views.py b/aleksis/core/views.py
index c1de17ada..442a3d4d9 100644
--- a/aleksis/core/views.py
+++ b/aleksis/core/views.py
@@ -93,7 +93,6 @@ from .forms import (
OAuthApplicationForm,
PersonForm,
PersonPreferenceForm,
- SchoolTermForm,
SelectPermissionForm,
SitePreferenceForm,
)
@@ -109,7 +108,6 @@ from .models import (
OAuthApplication,
Person,
PersonInvitation,
- SchoolTerm,
)
from .registries import (
group_preferences_registry,
@@ -126,7 +124,6 @@ from .tables import (
GroupTypesTable,
InvitationsTable,
PersonsTable,
- SchoolTermTable,
UserGlobalPermissionTable,
UserObjectPermissionTable,
)
@@ -263,40 +260,6 @@ def index(request: HttpRequest) -> HttpResponse:
return render(request, "core/index.html", context)
-@method_decorator(pwa_cache, name="dispatch")
-class SchoolTermListView(PermissionRequiredMixin, SingleTableView):
- """Table of all school terms."""
-
- model = SchoolTerm
- table_class = SchoolTermTable
- permission_required = "core.view_schoolterm_rule"
- template_name = "core/school_term/list.html"
-
-
-@method_decorator(never_cache, name="dispatch")
-class SchoolTermCreateView(PermissionRequiredMixin, AdvancedCreateView):
- """Create view for school terms."""
-
- model = SchoolTerm
- form_class = SchoolTermForm
- permission_required = "core.add_schoolterm_rule"
- template_name = "core/school_term/create.html"
- success_url = reverse_lazy("school_terms")
- success_message = _("The school term has been created.")
-
-
-@method_decorator(never_cache, name="dispatch")
-class SchoolTermEditView(PermissionRequiredMixin, AdvancedEditView):
- """Edit view for school terms."""
-
- model = SchoolTerm
- form_class = SchoolTermForm
- permission_required = "core.edit_schoolterm"
- template_name = "core/school_term/edit.html"
- success_url = reverse_lazy("school_terms")
- success_message = _("The school term has been saved.")
-
-
@pwa_cache
@permission_required("core.view_persons_rule")
def persons(request: HttpRequest) -> HttpResponse:
--
GitLab