Browse Source
Merge pull request #11796 from abpframework/auto-merge/rel-5-1/894
Merge branch dev with rel-5.1
pull/11811/head
liangshiwei
4 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with
4 additions and
2 deletions
-
modules/setting-management/src/Volo.Abp.SettingManagement.Blazor/Pages/SettingManagement/SettingManagement.razor
-
modules/tenant-management/src/Volo.Abp.TenantManagement.Blazor/Pages/TenantManagement/TenantManagement.razor.cs
|
|
|
@ -11,7 +11,7 @@ |
|
|
|
|
|
|
|
<Card> |
|
|
|
<CardBody> |
|
|
|
<Tabs @bind-SelectedTab="@SelectedGroup" TabPosition="TabPosition.Left" Pills="true" Mode="TabsMode.LazyReload"> |
|
|
|
<Tabs @bind-SelectedTab="@SelectedGroup" TabPosition="TabPosition.Left" Pills="true" Mode="TabsMode.LazyReload" VerticalItemsColumnSize="ColumnSize.Is3"> |
|
|
|
<Items> |
|
|
|
@foreach (var group in SettingComponentCreationContext.Groups) |
|
|
|
{ |
|
|
|
|
|
|
|
@ -8,6 +8,7 @@ using Volo.Abp.AspNetCore.Components.Web.Extensibility.EntityActions; |
|
|
|
using Volo.Abp.AspNetCore.Components.Web.Extensibility.TableColumns; |
|
|
|
using Volo.Abp.AspNetCore.Components.Web.Theming.PageToolbars; |
|
|
|
using Volo.Abp.BlazoriseUI; |
|
|
|
using Volo.Abp.FeatureManagement; |
|
|
|
using Volo.Abp.FeatureManagement.Blazor.Components; |
|
|
|
using Volo.Abp.ObjectExtending; |
|
|
|
using Volo.Abp.TenantManagement.Localization; |
|
|
|
@ -55,7 +56,8 @@ public partial class TenantManagement |
|
|
|
{ |
|
|
|
Toolbar.AddButton(L["ManageHostFeatures"], |
|
|
|
async () => await FeatureManagementModal.OpenAsync(FeatureProviderName), |
|
|
|
"fa fa-cog"); |
|
|
|
"fa fa-cog", |
|
|
|
requiredPolicyName: FeatureManagementPermissions.ManageHostFeatures); |
|
|
|
|
|
|
|
Toolbar.AddButton(L["NewTenant"], |
|
|
|
OpenCreateModalAsync, |
|
|
|
|
