mirror of
https://github.com/nottinghamtec/PyRIGS.git
synced 2026-10-11 23:25:46 +00:00
Port to Django 5.2 (#635)
* Port to Django 5.2 * Pin pluggy to 1.2.0 Any newer and the mystery importlib metadata error appears. Weird! >_> * Update for premailer changed default * Update view logic for is_ajax being changed to a template context processor * Port a few more tests to pytest proper Having two distinct test flavours is giving me a headache * Version 1 dockerfile Makes a VERY big image, I suspect we can optimise this a lot... * Optimise dockerfile a little lot a bit * fix(users): change logout link to POST request * fix(tests): fix some syntax errors in test code still got lots of failed tests :( * fix: replace deprecated Django APIs * ci: update Dockerfile * ci: update Dockerfile * fix(dependencies+tests): update EoL/vulnerable dependencies and improve test stability * Upgrade Python from 3.10 to 3.12 * Update frontend dependencies, replace node-sass with sass * chore(logging): ignore dangling obj reference warning from pypdf * ci: update compose.yml for prod deployment - Add Nginx as a reverse proxy - Add cert-selfsign.sh for generating self-signed certificates - Add certbot-issue.sh for Let's Encrypt certificate issuance and renewal - Add cron-install.sh and cron-uninstall.sh for system cron management - Add .env.example as an environment variable template * style: reformat code * ci: add more sleep trying to pass tests * ci: ignore browser-based tests during ci testing * fix: create home for the new user during Dockerfile building * chore: remove heroku conf file * fix: RIGS not franken anymore * fix: restore is_ajax as a boolean and split out the context processor * test: remove Selenium interaction tests and their CI workarounds * fix: harden production settings (CSRF origins, env casts, ADMINS) and drop dead debug toolbar code * deploy: serve static files from nginx, pin PGDATA, and make cert scripts loud on failure * build: switch .dockerignore to an allowlist * build: drop unused dependencies, soft-pin the rest and target Python 3.14 * build: move image to Python 3.14 / Node 24 and force DEBUG off * ci: add dependabot config for uv, npm, docker and actions * build: narrow Sass deprecation silencing to @import and require Node 24 * build: provide placeholder env for collectstatic now that DEBUG is off in the image * deploy: add plain-HTTP nginx config for local development and use it in compose * deploy: remove self-signed cert script * build: make the image multi-arch with official node and python base images * ci: lint and test on PRs, build the image on PRs and push it to GHCR on master * docs: add local running and sample data instructions * fix: report a form error instead of crashing when big power has no Power MIC * fix: upgrade pypdf and urllib3 to patched releases * fix: apply non-breaking npm audit fixes * fix: strip whitespace in ALLOWED_HOSTS and drop misleading HSTS preload * deploy: add a pyrigs healthcheck and make nginx wait for it * build: pin the uv image version * fix: correct the check-in person picker condition and use BeautifulSoup's string argument * refactor: replace unique_together with UniqueConstraint * build: replace pycodestyle with ruff and fix what it found Removes unused imports and variables, and fixes a few real problems it surfaced: - EventCheckIn.active() referenced an undefined name and raised NameError; it now returns whether the check-in has no end time - RIGS.admin defined EventChecklistAdmin twice; the second is now PowerTestRecordAdmin - RIGS/tests/conftest.py used date/timedelta without importing them - the signal-registering imports in apps.py are kept with noqa pycodestyle config in setup.cfg is dropped. * style: format the codebase with ruff * style: normalise line endings, trailing whitespace and end-of-file newlines * ci: run ruff and file hygiene through prek, and document it --------- Co-authored-by: Hang <me@hangxu.me> Co-authored-by: Joe Banks <joe@jb3.dev>
This commit is contained in:
GitHub
@@ -7,11 +7,11 @@ class PersonList(GenericListView):
|
||||
|
||||
def get_context_data(self, **kwargs):
|
||||
context = super().get_context_data(**kwargs)
|
||||
context['page_title'] = "People"
|
||||
context['create'] = 'person_create'
|
||||
context['edit'] = 'person_update'
|
||||
context['can_edit'] = self.request.user.has_perm('RIGS.change_person')
|
||||
context['detail'] = 'person_detail'
|
||||
context["page_title"] = "People"
|
||||
context["create"] = "person_create"
|
||||
context["edit"] = "person_update"
|
||||
context["can_edit"] = self.request.user.has_perm("RIGS.change_person")
|
||||
context["detail"] = "person_detail"
|
||||
return context
|
||||
|
||||
|
||||
@@ -20,29 +20,29 @@ class PersonDetail(GenericDetailView):
|
||||
|
||||
def get_context_data(self, **kwargs):
|
||||
context = super().get_context_data(**kwargs)
|
||||
context['history_link'] = 'person_history'
|
||||
context['detail_link'] = 'person_detail'
|
||||
context['update_link'] = 'person_update'
|
||||
context['associated'] = 'partials/associated_organisations.html'
|
||||
context['associated2'] = 'partials/associated_events.html'
|
||||
context['can_edit'] = self.request.user.has_perm('RIGS.change_person')
|
||||
context["history_link"] = "person_history"
|
||||
context["detail_link"] = "person_detail"
|
||||
context["update_link"] = "person_update"
|
||||
context["associated"] = "partials/associated_organisations.html"
|
||||
context["associated2"] = "partials/associated_events.html"
|
||||
context["can_edit"] = self.request.user.has_perm("RIGS.change_person")
|
||||
return context
|
||||
|
||||
|
||||
class PersonCreate(GenericCreateView, ModalURLMixin):
|
||||
model = models.Person
|
||||
fields = ['name', 'phone', 'email', 'address', 'notes']
|
||||
fields = ["name", "phone", "email", "address", "notes"]
|
||||
|
||||
def get_success_url(self):
|
||||
return self.get_close_url('person_update', 'person_detail')
|
||||
return self.get_close_url("person_update", "person_detail")
|
||||
|
||||
|
||||
class PersonUpdate(GenericUpdateView, ModalURLMixin):
|
||||
model = models.Person
|
||||
fields = ['name', 'phone', 'email', 'address', 'notes']
|
||||
fields = ["name", "phone", "email", "address", "notes"]
|
||||
|
||||
def get_success_url(self):
|
||||
return self.get_close_url('person_update', 'person_detail')
|
||||
return self.get_close_url("person_update", "person_detail")
|
||||
|
||||
|
||||
class OrganisationList(GenericListView):
|
||||
@@ -50,11 +50,11 @@ class OrganisationList(GenericListView):
|
||||
|
||||
def get_context_data(self, **kwargs):
|
||||
context = super().get_context_data(**kwargs)
|
||||
context['create'] = 'organisation_create'
|
||||
context['edit'] = 'organisation_update'
|
||||
context['can_edit'] = self.request.user.has_perm('RIGS.change_organisation')
|
||||
context['detail'] = 'organisation_detail'
|
||||
context['union_account'] = True
|
||||
context["create"] = "organisation_create"
|
||||
context["edit"] = "organisation_update"
|
||||
context["can_edit"] = self.request.user.has_perm("RIGS.change_organisation")
|
||||
context["detail"] = "organisation_detail"
|
||||
context["union_account"] = True
|
||||
return context
|
||||
|
||||
|
||||
@@ -63,29 +63,29 @@ class OrganisationDetail(GenericDetailView):
|
||||
|
||||
def get_context_data(self, **kwargs):
|
||||
context = super().get_context_data(**kwargs)
|
||||
context['history_link'] = 'organisation_history'
|
||||
context['detail_link'] = 'organisation_detail'
|
||||
context['update_link'] = 'organisation_update'
|
||||
context['associated'] = 'partials/associated_people.html'
|
||||
context['associated2'] = 'partials/associated_events.html'
|
||||
context['can_edit'] = self.request.user.has_perm('RIGS.change_organisation')
|
||||
context["history_link"] = "organisation_history"
|
||||
context["detail_link"] = "organisation_detail"
|
||||
context["update_link"] = "organisation_update"
|
||||
context["associated"] = "partials/associated_people.html"
|
||||
context["associated2"] = "partials/associated_events.html"
|
||||
context["can_edit"] = self.request.user.has_perm("RIGS.change_organisation")
|
||||
return context
|
||||
|
||||
|
||||
class OrganisationCreate(GenericCreateView, ModalURLMixin):
|
||||
model = models.Organisation
|
||||
fields = ['name', 'phone', 'email', 'address', 'notes', 'union_account']
|
||||
fields = ["name", "phone", "email", "address", "notes", "union_account"]
|
||||
|
||||
def get_success_url(self):
|
||||
return self.get_close_url('organisation_update', 'organisation_detail')
|
||||
return self.get_close_url("organisation_update", "organisation_detail")
|
||||
|
||||
|
||||
class OrganisationUpdate(GenericUpdateView, ModalURLMixin):
|
||||
model = models.Organisation
|
||||
fields = ['name', 'phone', 'email', 'address', 'notes', 'union_account']
|
||||
fields = ["name", "phone", "email", "address", "notes", "union_account"]
|
||||
|
||||
def get_success_url(self):
|
||||
return self.get_close_url('organisation_update', 'organisation_detail')
|
||||
return self.get_close_url("organisation_update", "organisation_detail")
|
||||
|
||||
|
||||
class VenueList(GenericListView):
|
||||
@@ -93,10 +93,10 @@ class VenueList(GenericListView):
|
||||
|
||||
def get_context_data(self, **kwargs):
|
||||
context = super().get_context_data(**kwargs)
|
||||
context['create'] = 'venue_create'
|
||||
context['edit'] = 'venue_update'
|
||||
context['can_edit'] = self.request.user.has_perm('RIGS.change_venue')
|
||||
context['detail'] = 'venue_detail'
|
||||
context["create"] = "venue_create"
|
||||
context["edit"] = "venue_update"
|
||||
context["can_edit"] = self.request.user.has_perm("RIGS.change_venue")
|
||||
context["detail"] = "venue_detail"
|
||||
return context
|
||||
|
||||
|
||||
@@ -105,25 +105,25 @@ class VenueDetail(GenericDetailView):
|
||||
|
||||
def get_context_data(self, **kwargs):
|
||||
context = super().get_context_data(**kwargs)
|
||||
context['history_link'] = 'venue_history'
|
||||
context['detail_link'] = 'venue_detail'
|
||||
context['update_link'] = 'venue_update'
|
||||
context['associated2'] = 'partials/associated_events.html'
|
||||
context['can_edit'] = self.request.user.has_perm('RIGS.change_venue')
|
||||
context["history_link"] = "venue_history"
|
||||
context["detail_link"] = "venue_detail"
|
||||
context["update_link"] = "venue_update"
|
||||
context["associated2"] = "partials/associated_events.html"
|
||||
context["can_edit"] = self.request.user.has_perm("RIGS.change_venue")
|
||||
return context
|
||||
|
||||
|
||||
class VenueCreate(GenericCreateView, ModalURLMixin):
|
||||
model = models.Venue
|
||||
fields = ['name', 'phone', 'email', 'address', 'notes', 'three_phase_available']
|
||||
fields = ["name", "phone", "email", "address", "notes", "three_phase_available"]
|
||||
|
||||
def get_success_url(self):
|
||||
return self.get_close_url('venue_update', 'venue_detail')
|
||||
return self.get_close_url("venue_update", "venue_detail")
|
||||
|
||||
|
||||
class VenueUpdate(GenericUpdateView, ModalURLMixin):
|
||||
model = models.Venue
|
||||
fields = ['name', 'phone', 'email', 'address', 'notes', 'three_phase_available']
|
||||
fields = ["name", "phone", "email", "address", "notes", "three_phase_available"]
|
||||
|
||||
def get_success_url(self):
|
||||
return self.get_close_url('venue_update', 'venue_detail')
|
||||
return self.get_close_url("venue_update", "venue_detail")
|
||||
|
||||
Reference in New Issue
Block a user