mirror of
https://github.com/nottinghamtec/PyRIGS.git
synced 2026-10-07 04:55:29 +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:
@@ -15,28 +15,31 @@ class VersionHistory(generic.ListView):
|
||||
paginate_by = 25
|
||||
|
||||
def get_queryset(self, **kwargs):
|
||||
return RIGSVersion.objects.get_for_object(self.get_object()).select_related("revision",
|
||||
"revision__user").all().order_by(
|
||||
"-revision__date_created")
|
||||
return (
|
||||
RIGSVersion.objects.get_for_object(self.get_object())
|
||||
.select_related("revision", "revision__user")
|
||||
.all()
|
||||
.order_by("-revision__date_created")
|
||||
)
|
||||
|
||||
def get_object(self, **kwargs):
|
||||
# Goddamit, almost got away without specific hacks
|
||||
if self.kwargs['model'].__name__ == 'Asset':
|
||||
return get_object_or_404(self.kwargs['model'], asset_id=self.kwargs['pk'])
|
||||
if self.kwargs["model"].__name__ == "Asset":
|
||||
return get_object_or_404(self.kwargs["model"], asset_id=self.kwargs["pk"])
|
||||
else:
|
||||
return get_object_or_404(self.kwargs['model'], pk=self.kwargs['pk'])
|
||||
return get_object_or_404(self.kwargs["model"], pk=self.kwargs["pk"])
|
||||
|
||||
def get_context_data(self, **kwargs):
|
||||
context = super().get_context_data(**kwargs)
|
||||
context['object'] = self.get_object()
|
||||
if self.kwargs['app'] != 'rigboard':
|
||||
context['override'] = f'base_{self.kwargs["app"]}.html'
|
||||
context["object"] = self.get_object()
|
||||
if self.kwargs["app"] != "rigboard":
|
||||
context["override"] = f"base_{self.kwargs['app']}.html"
|
||||
|
||||
return context
|
||||
|
||||
|
||||
def get_models(app=None):
|
||||
models = filter(lambda item: not hasattr(item, 'reversion_hide'), reversion.get_registered_models())
|
||||
models = filter(lambda item: not hasattr(item, "reversion_hide"), reversion.get_registered_models())
|
||||
if app is not None:
|
||||
models = filter(lambda item: item in apps.get_app_config(app).get_models(), models)
|
||||
# Don't allow modifying original list!
|
||||
@@ -46,7 +49,9 @@ def get_models(app=None):
|
||||
# TODO Default filter of having permission to view associated object
|
||||
def filter_models(models, user):
|
||||
if user is not None:
|
||||
models = filter(lambda model: not hasattr(model, 'reversion_perm') or user.has_perm(model.reversion_perm), models)
|
||||
models = filter(
|
||||
lambda model: not hasattr(model, "reversion_perm") or user.has_perm(model.reversion_perm), models
|
||||
)
|
||||
return models
|
||||
|
||||
|
||||
@@ -56,13 +61,15 @@ class ActivityTable(generic.ListView):
|
||||
paginate_by = 25
|
||||
|
||||
def get_queryset(self):
|
||||
return RIGSVersion.objects.get_for_multiple_models(filter_models(self.kwargs.get('models'), self.request.user)).order_by("-revision__date_created")
|
||||
return RIGSVersion.objects.get_for_multiple_models(
|
||||
filter_models(self.kwargs.get("models"), self.request.user)
|
||||
).order_by("-revision__date_created")
|
||||
|
||||
def get_context_data(self, **kwargs):
|
||||
context = super().get_context_data(**kwargs)
|
||||
context['page_title'] = f"{title(self.kwargs['app'])} Activity Stream"
|
||||
if self.kwargs['app'] != 'rigboard':
|
||||
context['override'] = f'base_{self.kwargs["app"]}.html'
|
||||
context["page_title"] = f"{title(self.kwargs['app'])} Activity Stream"
|
||||
if self.kwargs["app"] != "rigboard":
|
||||
context["override"] = f"base_{self.kwargs['app']}.html"
|
||||
|
||||
return context
|
||||
|
||||
@@ -73,17 +80,19 @@ class ActivityFeed(generic.ListView): # Appears on homepage
|
||||
paginate_by = 25
|
||||
|
||||
def get_queryset(self):
|
||||
return RIGSVersion.objects.get_for_multiple_models(filter_models(get_models(), self.request.user)).order_by("-revision__date_created")
|
||||
return RIGSVersion.objects.get_for_multiple_models(filter_models(get_models(), self.request.user)).order_by(
|
||||
"-revision__date_created"
|
||||
)
|
||||
|
||||
def get_context_data(self, **kwargs):
|
||||
# Call the base implementation first to get a context
|
||||
context = super().get_context_data(**kwargs)
|
||||
context['page_title'] = "Activity Feed"
|
||||
context["page_title"] = "Activity Feed"
|
||||
maxTimeDelta = datetime.timedelta(hours=1)
|
||||
|
||||
items = []
|
||||
|
||||
for thisVersion in context['object_list']:
|
||||
for thisVersion in context["object_list"]:
|
||||
thisVersion.withPrevious = False
|
||||
if len(items) >= 1:
|
||||
timeDiff = items[-1].revision.date_created - thisVersion.revision.date_created
|
||||
|
||||
Reference in New Issue
Block a user