Browse Source
Merge pull request #15218 from abpframework/auto-merge/rel-7-0/1610
Merge branch dev with rel-7.0
pull/15258/head
maliming
3 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with
5 additions and
14 deletions
-
modules/openiddict/src/Volo.Abp.OpenIddict.AspNetCore/Volo.Abp.OpenIddict.AspNetCore.csproj
-
modules/openiddict/src/Volo.Abp.OpenIddict.Domain.Shared/Volo.Abp.OpenIddict.Domain.Shared.csproj
-
modules/openiddict/src/Volo.Abp.OpenIddict.Domain/Volo.Abp.OpenIddict.Domain.csproj
-
npm/ng-packs/packages/tenant-management/src/lib/defaults/default-tenants-toolbar-actions.ts
|
|
@ -20,8 +20,8 @@ |
|
|
</ItemGroup> |
|
|
</ItemGroup> |
|
|
|
|
|
|
|
|
<ItemGroup> |
|
|
<ItemGroup> |
|
|
<PackageReference Include="OpenIddict.Server.AspNetCore" Version="4.0.0-rc1.22607.41" /> |
|
|
<PackageReference Include="OpenIddict.Server.AspNetCore" Version="4.0.0" /> |
|
|
<PackageReference Include="OpenIddict.Validation.AspNetCore" Version="4.0.0-rc1.22607.41" /> |
|
|
<PackageReference Include="OpenIddict.Validation.AspNetCore" Version="4.0.0" /> |
|
|
<PackageReference Include="OpenIddict.Validation.ServerIntegration" Version="4.0.0-rc1.22607.41" /> |
|
|
<PackageReference Include="OpenIddict.Validation.ServerIntegration" Version="4.0.0" /> |
|
|
</ItemGroup> |
|
|
</ItemGroup> |
|
|
</Project> |
|
|
</Project> |
|
|
|
|
|
@ -14,7 +14,7 @@ |
|
|
</ItemGroup> |
|
|
</ItemGroup> |
|
|
|
|
|
|
|
|
<ItemGroup> |
|
|
<ItemGroup> |
|
|
<PackageReference Include="OpenIddict.Abstractions" Version="4.0.0-rc1.22607.41" /> |
|
|
<PackageReference Include="OpenIddict.Abstractions" Version="4.0.0" /> |
|
|
<PackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="$(MicrosoftPackageVersion)" /> |
|
|
<PackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="$(MicrosoftPackageVersion)" /> |
|
|
</ItemGroup> |
|
|
</ItemGroup> |
|
|
|
|
|
|
|
|
|
|
|
@ -17,7 +17,7 @@ |
|
|
</ItemGroup> |
|
|
</ItemGroup> |
|
|
|
|
|
|
|
|
<ItemGroup> |
|
|
<ItemGroup> |
|
|
<PackageReference Include="OpenIddict.Core" Version="4.0.0-rc1.22607.41" /> |
|
|
<PackageReference Include="OpenIddict.Core" Version="4.0.0" /> |
|
|
</ItemGroup> |
|
|
</ItemGroup> |
|
|
|
|
|
|
|
|
</Project> |
|
|
</Project> |
|
|
|
|
|
@ -3,15 +3,6 @@ import { ToolbarAction } from '@abp/ng.theme.shared/extensions'; |
|
|
import { TenantsComponent } from '../components/tenants/tenants.component'; |
|
|
import { TenantsComponent } from '../components/tenants/tenants.component'; |
|
|
|
|
|
|
|
|
export const DEFAULT_TENANTS_TOOLBAR_ACTIONS = ToolbarAction.createMany<TenantDto[]>([ |
|
|
export const DEFAULT_TENANTS_TOOLBAR_ACTIONS = ToolbarAction.createMany<TenantDto[]>([ |
|
|
{ |
|
|
|
|
|
text: 'AbpTenantManagement::ManageHostFeatures', |
|
|
|
|
|
action: data => { |
|
|
|
|
|
const component = data.getInjected(TenantsComponent); |
|
|
|
|
|
component.openFeaturesModal(''); |
|
|
|
|
|
}, |
|
|
|
|
|
permission: 'FeatureManagement.ManageHostFeatures', |
|
|
|
|
|
icon: 'fa fa-cog', |
|
|
|
|
|
}, |
|
|
|
|
|
{ |
|
|
{ |
|
|
text: 'AbpTenantManagement::NewTenant', |
|
|
text: 'AbpTenantManagement::NewTenant', |
|
|
action: data => { |
|
|
action: data => { |
|
|
|
