Browse Source
Merge pull request #10107 from abpframework/auto-merge/rel-4-4/555
Merge branch dev with rel-4.4
pull/10111/head
maliming
5 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with
2 additions and
2 deletions
-
framework/src/Volo.Abp.EntityFrameworkCore.Oracle/Volo.Abp.EntityFrameworkCore.Oracle.csproj
-
modules/permission-management/src/Volo.Abp.PermissionManagement.Web/Pages/AbpPermissionManagement/PermissionManagementModal.cshtml
|
|
@ -18,7 +18,7 @@ |
|
|
<ProjectReference Include="..\Volo.Abp.EntityFrameworkCore\Volo.Abp.EntityFrameworkCore.csproj" /> |
|
|
<ProjectReference Include="..\Volo.Abp.EntityFrameworkCore\Volo.Abp.EntityFrameworkCore.csproj" /> |
|
|
</ItemGroup> |
|
|
</ItemGroup> |
|
|
|
|
|
|
|
|
<ItemGroup> |
|
|
<ItemGroup> |
|
|
<PackageReference Include="Oracle.EntityFrameworkCore" Version="5.21.1" /> |
|
|
<PackageReference Include="Oracle.EntityFrameworkCore" Version="5.21.1" /> |
|
|
</ItemGroup> |
|
|
</ItemGroup> |
|
|
|
|
|
|
|
|
|
|
|
@ -24,7 +24,7 @@ |
|
|
<abp-tab title="@group.DisplayName" name="v-pills-tab-@group.GetNormalizedGroupName()"> |
|
|
<abp-tab title="@group.DisplayName" name="v-pills-tab-@group.GetNormalizedGroupName()"> |
|
|
<h4>@group.DisplayName</h4> |
|
|
<h4>@group.DisplayName</h4> |
|
|
<hr class="mt-2 mb-3"/> |
|
|
<hr class="mt-2 mb-3"/> |
|
|
<div class="custom-scroll-content"> |
|
|
<div class="w-100" style="max-height: 640px;overflow-y: auto"> |
|
|
<div class="pl-1 pt-1"> |
|
|
<div class="pl-1 pt-1"> |
|
|
<abp-input asp-for="@group.IsAllPermissionsGranted" |
|
|
<abp-input asp-for="@group.IsAllPermissionsGranted" |
|
|
check-box-hidden-input-render-mode="None" |
|
|
check-box-hidden-input-render-mode="None" |
|
|
|
