mirror of
https://github.com/nottinghamtec/PyRIGS.git
synced 2026-10-10 14:52:53 +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:
@@ -1,44 +1,58 @@
|
||||
from django.urls import path
|
||||
from django.apps import apps
|
||||
from django.urls import path
|
||||
from django.template.loader import get_template
|
||||
from django.template import TemplateDoesNotExist
|
||||
|
||||
from PyRIGS.decorators import (permission_required_with_403)
|
||||
from PyRIGS.decorators import permission_required_with_403
|
||||
from versioning import views
|
||||
|
||||
urlpatterns = [
|
||||
path('rigboard/activity/feed/',
|
||||
permission_required_with_403('RIGS.view_event')(views.ActivityFeed.as_view()),
|
||||
name='activity_feed'),
|
||||
path(
|
||||
"rigboard/activity/feed/",
|
||||
permission_required_with_403("RIGS.view_event")(views.ActivityFeed.as_view()),
|
||||
name="activity_feed",
|
||||
),
|
||||
]
|
||||
|
||||
for app in [apps.get_app_config(label) for label in ("RIGS", "assets", "training")]:
|
||||
appname = str(app.label)
|
||||
if appname == 'RIGS':
|
||||
appname = 'rigboard'
|
||||
table_name = 'activity_table'
|
||||
if appname == "RIGS":
|
||||
appname = "rigboard"
|
||||
table_name = "activity_table"
|
||||
else:
|
||||
table_name = appname + '_activity_table'
|
||||
table_name = appname + "_activity_table"
|
||||
|
||||
# TODO Proper Permissions
|
||||
urlpatterns += [
|
||||
path(appname + '/activity/', permission_required_with_403('RIGS.add_event')(views.ActivityTable.as_view()),
|
||||
name=table_name, kwargs={'app': appname, 'models': views.get_models(app.label)}), ]
|
||||
path(
|
||||
appname + "/activity/",
|
||||
permission_required_with_403("RIGS.add_event")(views.ActivityTable.as_view()),
|
||||
name=table_name,
|
||||
kwargs={"app": appname, "models": views.get_models(app.label)},
|
||||
),
|
||||
]
|
||||
|
||||
for model in views.get_models(app=app.label):
|
||||
modelname = model.__name__.lower()
|
||||
if appname == 'rigboard':
|
||||
if appname == "rigboard":
|
||||
urlpatterns += [
|
||||
path(f'{modelname}/<str:pk>/history/',
|
||||
permission_required_with_403(f'{app.label}.change_{modelname}')(
|
||||
views.VersionHistory.as_view()),
|
||||
name=f'{modelname}_history', kwargs={'model': model, 'app': appname, }),
|
||||
path(
|
||||
f"{modelname}/<str:pk>/history/",
|
||||
permission_required_with_403(f"{app.label}.change_{modelname}")(views.VersionHistory.as_view()),
|
||||
name=f"{modelname}_history",
|
||||
kwargs={
|
||||
"model": model,
|
||||
"app": appname,
|
||||
},
|
||||
),
|
||||
]
|
||||
else:
|
||||
urlpatterns += [
|
||||
path(f'{appname}/{modelname}/<str:pk>/history/',
|
||||
permission_required_with_403(f'{app.label}.change_{modelname}')(
|
||||
views.VersionHistory.as_view()),
|
||||
name=f'{modelname}_history', kwargs={'model': model, 'app': appname, }),
|
||||
path(
|
||||
f"{appname}/{modelname}/<str:pk>/history/",
|
||||
permission_required_with_403(f"{app.label}.change_{modelname}")(views.VersionHistory.as_view()),
|
||||
name=f"{modelname}_history",
|
||||
kwargs={
|
||||
"model": model,
|
||||
"app": appname,
|
||||
},
|
||||
),
|
||||
]
|
||||
|
||||
Reference in New Issue
Block a user