From 6e35ac9eb08e1d66b073e6a532cc6c20132c4110 Mon Sep 17 00:00:00 2001 From: Mat Date: Mon, 23 Sep 2024 17:12:51 +0200 Subject: [PATCH] Now uses correct username for lock filtering. WIP: needs an error popup if user is misconfigured --- src/ViewModels/LFSLocks.cs | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/src/ViewModels/LFSLocks.cs b/src/ViewModels/LFSLocks.cs index 18e99c8b..d5820b64 100644 --- a/src/ViewModels/LFSLocks.cs +++ b/src/ViewModels/LFSLocks.cs @@ -45,7 +45,13 @@ namespace SourceGit.ViewModels { get { - return ShowOnlyMyLocks ? Locks.Where(@lock => @lock.User == "Mat") : Locks; + if (string.IsNullOrEmpty(_userName)) + { + //todo: add an error popup + return Locks; + } + + return ShowOnlyMyLocks ? Locks.Where(@lock => @lock.User == _userName) : Locks; } } @@ -54,6 +60,7 @@ namespace SourceGit.ViewModels _repo = repo; _remote = remote; Locks = new AvaloniaList(); + new Commands.Config(repo).ListAll().TryGetValue("user.name", out _userName); Task.Run(() => { @@ -94,5 +101,6 @@ namespace SourceGit.ViewModels private bool _isLoading = true; private bool _isEmpty = false; private bool _showOnlyMyLocks = false; + private string _userName; } }