nhyatt/bitwarden
1
0
Fork 0
mirror of https://github.com/bitwarden/server.git synced 2025-06-08 12:10:30 -05:00
Code

change verbiage, add column to table (#5888)

Browse Source
This commit is contained in:
Brandon Treston 2025-05-28 12:06:25 -04:00 committed by GitHub
parent 31b6b47eac
commit cd994f72bf
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 22 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Admin/AdminConsole/Models/ProviderViewModel.cs
View File

@ -19,7 +19,7 @@ public class ProviderViewModel
{ {
Provider = provider; Provider = provider;
UserCount = providerUsers.Count(); UserCount = providerUsers.Count();
ProviderAdmins = providerUsers.Where(u => u.Type == ProviderUserType.ProviderAdmin); ProviderUsers = providerUsers;
ProviderOrganizations = organizations.Where(o => o.ProviderId == provider.Id); ProviderOrganizations = organizations.Where(o => o.ProviderId == provider.Id);
if (Provider.Type == ProviderType.Msp) if (Provider.Type == ProviderType.Msp)
@ -61,7 +61,7 @@ public class ProviderViewModel
public int UserCount { get; set; } public int UserCount { get; set; }
public Provider Provider { get; set; } public Provider Provider { get; set; }
public IEnumerable<ProviderUserUserDetails> ProviderAdmins { get; set; } public IEnumerable<ProviderUserUserDetails> ProviderUsers { get; set; }
public IEnumerable<ProviderOrganizationOrganizationDetails> ProviderOrganizations { get; set; } public IEnumerable<ProviderOrganizationOrganizationDetails> ProviderOrganizations { get; set; }
public List<ProviderPlanViewModel> ProviderPlanViewModels { get; set; } = []; public List<ProviderPlanViewModel> ProviderPlanViewModels { get; set; } = [];
} }

29
src/Admin/AdminConsole/Views/Providers/Admins.cshtml
View File

@ -7,7 +7,7 @@
var canResendEmailInvite = AccessControlService.UserHasPermission(Permission.Provider_ResendEmailInvite); var canResendEmailInvite = AccessControlService.UserHasPermission(Permission.Provider_ResendEmailInvite);
} }
<h2>Provider Admins</h2> <h2>Administrators</h2>
<div class="row"> <div class="row">
<div class="col-8"> <div class="col-8">
<div class="table-responsive"> <div class="table-responsive">
@ -15,12 +15,13 @@
<thead> <thead>
<tr> <tr>
<th style="width: 190px;">Email</th> <th style="width: 190px;">Email</th>
<th style="width: 160px;">Role</th>
<th style="width: 40px;">Status</th> <th style="width: 40px;">Status</th>
<th style="width: 30px;"></th> <th style="width: 30px;"></th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
@if(!Model.ProviderAdmins.Any()) @if(!Model.ProviderUsers.Any())
{ {
<tr> <tr>
<td colspan="6">No results to list.</td> <td colspan="6">No results to list.</td>
@ -28,29 +29,39 @@
} }
else else
{ {
@foreach(var admin in Model.ProviderAdmins) @foreach(var user in Model.ProviderUsers)
{ {
<tr> <tr>
<td class="align-middle"> <td class="align-middle">
@admin.Email @user.Email
</td> </td>
<td class="align-middle"> <td class="align-middle">
@admin.Status @if(@user.Type == 0)
{
<span>Provider Admin</span>
}
else
{
<span>Service User</span>
}
</td>
<td class="align-middle">
@user.Status
</td> </td>
<td> <td>
@if(admin.Status.Equals(ProviderUserStatusType.Confirmed) @if(user.Status.Equals(ProviderUserStatusType.Confirmed)
&& @Model.Provider.Status.Equals(ProviderStatusType.Pending) && @Model.Provider.Status.Equals(ProviderStatusType.Pending)
&& canResendEmailInvite) && canResendEmailInvite)
{ {
@if(@TempData["InviteResentTo"] != null && @TempData["InviteResentTo"].ToString() == @admin.UserId.Value.ToString()) @if(@TempData["InviteResentTo"] != null && @TempData["InviteResentTo"].ToString() == @user.UserId.Value.ToString())
{ {
<button class="btn btn-outline-success btn-sm disabled" disabled>Invite Resent!</button> <button class="btn btn-outline-success btn-sm disabled" disabled>Invite Resent!</button>
} }
else else
{ {
<a class="btn btn-outline-secondary btn-sm" <a class="btn btn-outline-secondary btn-sm"
data-id="@admin.Id" asp-controller="Providers" data-id="@user.Id" asp-controller="Providers"
asp-action="ResendInvite" asp-route-ownerId="@admin.UserId" asp-action="ResendInvite" asp-route-ownerId="@user.UserId"
asp-route-providerId="@Model.Provider.Id"> asp-route-providerId="@Model.Provider.Id">
Resend Setup Invite Resend Setup Invite
</a> </a>