From 8b969ae4b459583754d73e7bd70cf70d6ba5382a Mon Sep 17 00:00:00 2001 From: Dirk-Willem van Gulik Date: Tue, 29 Oct 2024 16:16:39 +0100 Subject: [PATCH 1/3] Fix ref --- selfservice/management/commands/send-acl-reminders.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/selfservice/management/commands/send-acl-reminders.py b/selfservice/management/commands/send-acl-reminders.py index aae11dd..9eeea8f 100644 --- a/selfservice/management/commands/send-acl-reminders.py +++ b/selfservice/management/commands/send-acl-reminders.py @@ -2,7 +2,7 @@ from django.conf import settings from django.core.management.base import BaseCommand -from makespaceleiden.mail import emailPlain +from makerspaceleiden.mail import emailPlain from acl.models import Entitlement From 543cd9fb5403d807535a8b3f74fd027b5bdfa6d8 Mon Sep 17 00:00:00 2001 From: Dirk-Willem van Gulik Date: Tue, 29 Oct 2024 16:17:36 +0100 Subject: [PATCH 2/3] Migration of new name for balance --- .../0015_alter_pettycashbalancecache_owner.py | 21 +++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 pettycash/migrations/0015_alter_pettycashbalancecache_owner.py diff --git a/pettycash/migrations/0015_alter_pettycashbalancecache_owner.py b/pettycash/migrations/0015_alter_pettycashbalancecache_owner.py new file mode 100644 index 0000000..4bbb4d4 --- /dev/null +++ b/pettycash/migrations/0015_alter_pettycashbalancecache_owner.py @@ -0,0 +1,21 @@ +# Generated by Django 4.2.8 on 2024-10-29 12:15 + +from django.conf import settings +from django.db import migrations, models +import django.db.models.deletion + + +class Migration(migrations.Migration): + + dependencies = [ + migrations.swappable_dependency(settings.AUTH_USER_MODEL), + ('pettycash', '0014_remove_historicalpettycashterminal_history_user_and_more'), + ] + + operations = [ + migrations.AlterField( + model_name='pettycashbalancecache', + name='owner', + field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='pettycash_cache', to=settings.AUTH_USER_MODEL), + ), + ] From b5ed9dd158801a1b07bde4299db4ffcc2b118713 Mon Sep 17 00:00:00 2001 From: Dirk-Willem van Gulik Date: Tue, 29 Oct 2024 16:22:06 +0100 Subject: [PATCH 3/3] Move from normal admin to is priveleged flag --- acl/models.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/acl/models.py b/acl/models.py index 9c245b7..18013af 100644 --- a/acl/models.py +++ b/acl/models.py @@ -221,7 +221,7 @@ def useState(self, user): # machines by doing something special here. So hence # we do not set the OVERRIDE bit here. # - if user.admin or self.canInstruct(user): + if user.is_privileged or self.canInstruct(user): flags |= MachineUseFlags.OVERRIDE return [needs, flags]