Skip to content

fix: school creation and editing #982

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jan 21, 2025
Merged

fix: school creation and editing #982

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 8 additions & 3 deletions bullet/bullet_admin/views/education.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
from django.contrib import messages
from django.http import HttpResponseRedirect
from django.urls import reverse, reverse_lazy
from django.views.generic import CreateView, ListView, UpdateView
Expand All @@ -6,7 +7,6 @@
from bullet import search
from bullet_admin.access import CountryAdminAccess, CountryAdminInAccess
from bullet_admin.forms.education import SchoolForm
from bullet_admin.mixins import RedirectBackMixin
from bullet_admin.utils import get_allowed_countries
from bullet_admin.views import GenericForm, GenericList

Expand Down Expand Up @@ -69,38 +69,43 @@ def get_edit_url(self, school: School) -> str:
class SchoolUpdateView(
CountryAdminInAccess,
SchoolQuerySetMixin,
RedirectBackMixin,
GenericForm,
UpdateView,
):
form_class = SchoolForm
template_name = "bullet_admin/education/school_form.html"
form_title = "Edit school"
require_unlocked_competition = False
success_url = reverse_lazy("badmin:school_list")

def get_permission_country(self):
return self.get_object().country

def form_valid(self, form):
school: School = form.save(commit=False)
self.object = school
school.importer_ignored = True
school.save()
form.save_m2m()

messages.success(self.request, "School saved.")
return HttpResponseRedirect(self.get_success_url())


class SchoolCreateView(
CountryAdminAccess, SchoolQuerySetMixin, RedirectBackMixin, GenericForm, CreateView
CountryAdminAccess, SchoolQuerySetMixin, GenericForm, CreateView
):
require_unlocked_competition = False
form_class = SchoolForm
form_title = "New school"
success_url = reverse_lazy("badmin:school_list")

def form_valid(self, form):
school: School = form.save(commit=False)
self.object = school
school.importer_ignored = True
school.save()
form.save_m2m()

messages.success(self.request, "School saved.")
return HttpResponseRedirect(self.get_success_url())
Loading