From d0ce377d92028f1d2d4a7e8e27b9c08ec10c21d3 Mon Sep 17 00:00:00 2001
From: Lorenz Stechauner <lorenz.stechauner@necronda.net>
Date: Mon, 22 Jun 2026 20:06:34 +0200
Subject: [PATCH] AppDbContext: Fix FetchMembers when using for specific MgNr

---
 Elwig/Documents/MemberDataSheet.cs | 2 +-
 Elwig/Helpers/AppDbContext.cs      | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Elwig/Documents/MemberDataSheet.cs b/Elwig/Documents/MemberDataSheet.cs
index 104767a..3fb64c9 100644
--- a/Elwig/Documents/MemberDataSheet.cs
+++ b/Elwig/Documents/MemberDataSheet.cs
@@ -30,7 +30,7 @@ namespace Elwig.Documents {
 
         public static async Task<MemberDataSheet> Initialize(int mgnr) {
             using var ctx = new AppDbContext();
-            return new MemberDataSheet(await ctx.FetchMembers(mgnr, true, true).SingleAsync());
+            return new MemberDataSheet(await ctx.FetchMembers(mgnr, includeContactInfo: true).SingleAsync());
         }
 
         protected override async Task LoadData(AppDbContext ctx) {
diff --git a/Elwig/Helpers/AppDbContext.cs b/Elwig/Helpers/AppDbContext.cs
index 9a29d31..d32a163 100644
--- a/Elwig/Helpers/AppDbContext.cs
+++ b/Elwig/Helpers/AppDbContext.cs
@@ -338,9 +338,9 @@ namespace Elwig.Helpers {
 
         public IAsyncEnumerable<Member> FetchMembers(int? mgnr = null, bool includeNotActive = false, bool includeContactInfo = false) {
             if (includeContactInfo) {
-                return _compiledQueryMembersContactInfo.Invoke(this, mgnr, includeNotActive);
+                return _compiledQueryMembersContactInfo.Invoke(this, mgnr, mgnr != null || includeNotActive);
             } else {
-                return _compiledQueryMembers.Invoke(this, mgnr, includeNotActive);
+                return _compiledQueryMembers.Invoke(this, mgnr, mgnr != null || includeNotActive);
             }
         }