Browse Source
Merge pull request #24998 from abpframework/auto-merge/rel-10-2/4397
Merge branch dev with rel-10.2
pull/25007/head
Volosoft Agent
4 weeks ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with
0 additions and
4 deletions
-
modules/permission-management/src/Volo.Abp.PermissionManagement.Blazor/Components/ResourcePermissionManagementModal.razor
-
modules/permission-management/src/Volo.Abp.PermissionManagement.Web/Pages/AbpPermissionManagement/AddResourcePermissionManagementModal.cshtml
-
modules/permission-management/src/Volo.Abp.PermissionManagement.Web/Pages/AbpPermissionManagement/UpdateResourcePermissionManagementModal.cshtml
|
|
|
@ -130,7 +130,6 @@ |
|
|
|
</Validation> |
|
|
|
</div> |
|
|
|
<div class="mb-3"> |
|
|
|
<h4>@L["ResourcePermissionPermissions"]</h4> |
|
|
|
<Switch TValue="bool" Value="CreateEntity.Permissions.All(x => x.IsGranted)" ValueChanged="GrantAllAsync">@L["GrantAllResourcePermissions"]</Switch> |
|
|
|
<div class="mt-2"> |
|
|
|
@foreach (var permission in CreateEntity.Permissions) |
|
|
|
@ -159,7 +158,6 @@ |
|
|
|
<ModalBody> |
|
|
|
<Validations @ref="@EditValidationsRef" Model="@EditEntity" ValidateOnLoad="false"> |
|
|
|
<div class="mb-3"> |
|
|
|
<h4>@L["ResourcePermissionPermissions"]</h4> |
|
|
|
<Switch TValue="bool" Value="EditEntity.Permissions.All(x => x.IsGranted)" ValueChanged="GrantAllAsync">@L["GrantAllResourcePermissions"]</Switch> |
|
|
|
<div class="mt-2"> |
|
|
|
@foreach (var permission in EditEntity.Permissions) |
|
|
|
|
|
|
|
@ -35,7 +35,6 @@ |
|
|
|
<span class="text-danger field-validation-valid" data-valmsg-for="AddModel.ProviderKey" data-valmsg-replace="true"></span> |
|
|
|
</div> |
|
|
|
<div class="position-relative mb-3" id="permissionList"> |
|
|
|
<h4>@L["ResourcePermissionPermissions"]</h4> |
|
|
|
<div class="form-check form-switch mb-2"> |
|
|
|
<input class="form-check-input" id="grantAllresourcePermissions" type="checkbox"> |
|
|
|
<label class="form-check-label" for="grantAllresourcePermissions">@L["GrantAllResourcePermissions"]</label> |
|
|
|
|
|
|
|
@ -23,7 +23,6 @@ |
|
|
|
<input asp-for="@Model.ProviderKey" /> |
|
|
|
<abp-modal-body> |
|
|
|
<div class="mb-3" id="permissionList"> |
|
|
|
<h4>@L["ResourcePermissionPermissions"]</h4> |
|
|
|
<div class="form-check form-switch mb-2"> |
|
|
|
<input class="form-check-input" id="grantAllresourcePermissions" type="checkbox" checked="@Model.ResourcePermissions.Permissions.All(x => x.IsGranted)"> |
|
|
|
<label class="form-check-label" for="grantAllresourcePermissions">@L["GrantAllResourcePermissions"]</label> |
|
|
|
|
