Browse Source

Merge remote-tracking branch 'origin/rel-10.7' into auto-merge-forward/rel-10.7-to-rel-11.0-152

pull/26426/head
github-actions[bot] 2 weeks ago
parent
commit
db89f38ca1
  1. 3
      modules/identity/src/Volo.Abp.Identity.Blazor.MudBlazor/Pages/Identity/RoleManagement.razor.cs
  2. 3
      modules/identity/src/Volo.Abp.Identity.Blazor.MudBlazor/Pages/Identity/UserManagement.razor.cs
  3. 3
      modules/tenant-management/src/Volo.Abp.TenantManagement.Blazor.MudBlazor/Pages/TenantManagement/TenantManagement.razor.cs

3
modules/identity/src/Volo.Abp.Identity.Blazor.MudBlazor/Pages/Identity/RoleManagement.razor.cs

@ -91,8 +91,7 @@ public partial class RoleManagement
{
Text = L["Delete"],
Visible = (data) => HasDeletePermission && !data.As<IdentityRoleDto>().IsStatic,
Clicked = async (data) => await DeleteEntityAsync(data.As<IdentityRoleDto>()),
ConfirmationMessage = (data) => GetDeleteConfirmationMessage(data.As<IdentityRoleDto>())
Clicked = async (data) => await DeleteEntityAsync(data.As<IdentityRoleDto>())
}
});

3
modules/identity/src/Volo.Abp.Identity.Blazor.MudBlazor/Pages/Identity/UserManagement.razor.cs

@ -222,8 +222,7 @@ public partial class UserManagement
{
Text = L["Delete"],
Visible = (data) => HasDeletePermission && CurrentUser.GetId() != data.As<IdentityUserDto>().Id,
Clicked = async (data) => await DeleteEntityAsync(data.As<IdentityUserDto>()),
ConfirmationMessage = (data) => GetDeleteConfirmationMessage(data.As<IdentityUserDto>())
Clicked = async (data) => await DeleteEntityAsync(data.As<IdentityUserDto>())
}
});

3
modules/tenant-management/src/Volo.Abp.TenantManagement.Blazor.MudBlazor/Pages/TenantManagement/TenantManagement.razor.cs

@ -118,8 +118,7 @@ public partial class TenantManagement
{
Text = L["Delete"],
Visible = (data) => HasDeletePermission,
Clicked = async (data) => await DeleteEntityAsync(data.As<TenantDto>()),
ConfirmationMessage = (data) => GetDeleteConfirmationMessage(data.As<TenantDto>())
Clicked = async (data) => await DeleteEntityAsync(data.As<TenantDto>())
}
});

Loading…
Cancel
Save