Merge pull request #103 from MakerSpaceLeiden/prod

Fixes from prod

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]

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),
+        ),
+    ]

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