From 8e7451e17a779caedd44331253eb4336c98b668b Mon Sep 17 00:00:00 2001
From: "D. Berge" <dberge@aaltronav.eu>
Date: Thu, 24 Jul 2025 20:42:25 +0200
Subject: [PATCH] Adapt the access rights mixin to new user management code

---
 lib/www/client/source/src/mixins/access.js | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/lib/www/client/source/src/mixins/access.js b/lib/www/client/source/src/mixins/access.js
index 462b15a..1af1537 100644
--- a/lib/www/client/source/src/mixins/access.js
+++ b/lib/www/client/source/src/mixins/access.js
@@ -1,5 +1,5 @@
 import { mapGetters } from 'vuex';
-import access from '@/lib/organisations/access';
+import { Organisations } from '@dougal/organisations';
 
 export default {
   name: "AccessMixin",
@@ -10,10 +10,14 @@ export default {
 
   methods: {
 
-    access (operation, item) {
-      if (!item) item = this.projectConfiguration;
-
-      return access(this.user?.organisations ?? {}, item?.organisations ?? {}, operation);
+    access (operation, organisations) {
+      if (this.user) {
+        if (!organisations) organisations = this.projectConfiguration?.organisations;
+        if (!organisations instanceof Organisations) {
+          organisations = new Organisations(organisations);
+        }
+        return this.user.canDo(operation, organisations);
+      }
     },
 
     readaccess (item) {