From 0d468ef15a7b767bdd5645f722acfefe098ff543 Mon Sep 17 00:00:00 2001 From: "IGNY8 VPS (Salman)" Date: Sun, 16 Nov 2025 19:25:36 +0000 Subject: [PATCH] Phase 0: Improve ModuleEnableSettings get_queryset to filter by account - Updated get_queryset to properly filter by account - Ensures queryset is account-scoped before list() is called - Prevents potential conflicts with base class behavior --- backend/igny8_core/modules/system/settings_views.py | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/backend/igny8_core/modules/system/settings_views.py b/backend/igny8_core/modules/system/settings_views.py index 1306245d..fac91a30 100644 --- a/backend/igny8_core/modules/system/settings_views.py +++ b/backend/igny8_core/modules/system/settings_views.py @@ -309,7 +309,16 @@ class ModuleEnableSettingsViewSet(AccountModelViewSet): def get_queryset(self): """Get module enable settings for current account""" + # Return queryset filtered by account - but list() will handle get_or_create queryset = super().get_queryset() + # Filter by account if available + account = getattr(self.request, 'account', None) + if not account: + user = getattr(self.request, 'user', None) + if user: + account = getattr(user, 'account', None) + if account: + queryset = queryset.filter(account=account) return queryset def list(self, request, *args, **kwargs):