diff --git a/WebfrontCore/Views/Client/Find/_AdvancedFindContent.cshtml b/WebfrontCore/Views/Client/Find/_AdvancedFindContent.cshtml index cce7ecf5..d6466c44 100644 --- a/WebfrontCore/Views/Client/Find/_AdvancedFindContent.cshtml +++ b/WebfrontCore/Views/Client/Find/_AdvancedFindContent.cshtml @@ -8,15 +8,16 @@ var loc = Utilities.CurrentLocalization.LocalizationIndex; var client = Model; + var canSeeLevel = (ViewBag.PermissionsSet as IEnumerable).HasPermission(WebfrontEntity.ClientLevel, WebfrontPermission.Read); + var canSeeIp = (ViewBag.PermissionsSet as IEnumerable).HasPermission(WebfrontEntity.ClientIPAddress, WebfrontPermission.Read); + string FormatNameChange(ClientResourceResponse clientResponse) { return clientResponse.CurrentClientName.StripColors() != clientResponse.MatchedClientName?.StripColors() - ? $"{clientResponse.CurrentClientName} [{clientResponse.MatchedClientName}{(clientResponse.MatchedClientIp is null && clientResponse.MatchedClientIp != clientResponse.CurrentClientIp ? "" : $"/{clientResponse.MatchedClientIp.ConvertIPtoString()}")}]" + ? $"{clientResponse.CurrentClientName} [{clientResponse.MatchedClientName}{((clientResponse.MatchedClientIp is null && clientResponse.MatchedClientIp != clientResponse.CurrentClientIp) ? "" : $"/{FormatIpForPermission(clientResponse.MatchedClientIp)}")}]" : clientResponse.CurrentClientName; } - var canSeeLevel = (ViewBag.PermissionsSet as IEnumerable).HasPermission(WebfrontEntity.ClientLevel, WebfrontPermission.Read); - var canSeeIp = (ViewBag.PermissionsSet as IEnumerable).HasPermission(WebfrontEntity.ClientIPAddress, WebfrontPermission.Read); string ClassForLevel(EFClient.Permission permission) => !canSeeLevel ? "level-color-user" : $"level-color-{permission.ToString().ToLower()}"; string FormatIpForPermission(int? ip) => canSeeIp && ip is not null ? ip.ConvertIPtoString() : "-"; } @@ -73,16 +74,16 @@
- @if (client.MatchedClientIp != client.CurrentClientIp) - { + @if (client.MatchedClientIp != client.CurrentClientIp && canSeeIp) + { / @client.MatchedClientIp.ConvertIPtoString() - } + }
@FormatIpForPermission(client.CurrentClientIp)