Rim/IW4M-Admin
Rim/IW4M-Admin
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 30 Wiki Activity

only titleize single word titles on action dialogs

Browse Source
This commit is contained in:
RaidMax 2022-10-25 14:03:35 -05:00
parent 6fa15d3dcc
commit 797642f3e6
3 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Application/Misc/InteractionRegistration.cs
View File

@ -130,8 +130,8 @@ public class InteractionRegistration : IInteractionRegistration
return null;
}
private async Task<IEnumerable<IInteractionData>> GetInteractionsInternal(string prefix = null, int? clientId = null,
Reference.Game? game = null, CancellationToken token = default)
private async Task<IEnumerable<IInteractionData>> GetInteractionsInternal(string prefix = null,
int? clientId = null, Reference.Game? game = null, CancellationToken token = default)
{
var interactions = _interactions
.Where(interaction => string.IsNullOrWhiteSpace(prefix) || interaction.Key.StartsWith(prefix)).Select(
@ -149,9 +149,10 @@ public class InteractionRegistration : IInteractionRegistration
clientId);
return null;
}
}).Where(interaction => interaction is not null)
.ToList();
});
return await Task.WhenAll(interactions);
return (await Task.WhenAll(interactions))
.Where(interaction => interaction is not null)
.ToList();
}
}

2
WebfrontCore/Views/Action/_ActionForm.cshtml
View File

@ -3,7 +3,7 @@
@{
Layout = null;
}
<h5 class="modal-title mb-10">@Model.Name?.Titleize()</h5>
<h5 class="modal-title mb-10">@(Model.Name?.Split(" ").Length == 1 ? Model.Name?.Titleize() : Model.Name)</h5>
@if (Model.Inputs.Any(input => input.Type != "hidden"))
{
<hr class="mb-10"/>

7
WebfrontCore/Views/Client/Profile/Index.cshtml
View File

@ -393,13 +393,8 @@
});
}
foreach (var interaction in Model.Interactions?.Where(i => (int?)ViewBag.User?.Level >= ((int?)i?.MinimumPermission ?? 0)))
foreach (var interaction in Model.Interactions.Where(i => (int)ViewBag.User.Level >= ((int?)i.MinimumPermission ?? 0)))
{
if (interaction is null)
{
continue;
}
menuItems.Items.Add(new SideContextMenuItem
{
Title = interaction.Name,