tsai
/
abp
mirror of https://github.com/abpframework/abp.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Merge pull request #15216 from abpframework/fix-host-settings-feature 

Setting management page should always visible to host side
pull/15229/head
Muhammed Altuğ 4 years ago
committed by GitHub
parent
7343e6bd56 37b1ad6683
commit
b421b7aa5e
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 25 additions and 24 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 44
      modules/feature-management/src/Volo.Abp.FeatureManagement.Blazor/Components/FeatureManagementModal.razor
  2. 3
      modules/setting-management/src/Volo.Abp.SettingManagement.Domain.Shared/Volo/Abp/SettingManagement/SettingManagementFeatureDefinitionProvider.cs
  3. 2
      modules/setting-management/src/Volo.Abp.SettingManagement.Web/Settings/EmailingPageContributor.cs

44
modules/feature-management/src/Volo.Abp.FeatureManagement.Blazor/Components/FeatureManagementModal.razor
View File

@ -6,15 +6,15 @@
<ModalContent Size="ModalSize.Large" Centered="true"> <ModalContent Size="ModalSize.Large" Centered="true">
<ModalHeader> <ModalHeader>
<ModalTitle>@L["Features"]</ModalTitle> <ModalTitle>@L["Features"]</ModalTitle>
<CloseButton Clicked="CloseModal"/> <CloseButton Clicked="CloseModal" />
</ModalHeader> </ModalHeader>
<ModalBody MaxHeight="50"> @if (Groups == null || !Groups.Any())
@if (Groups == null || !Groups.Any()) {
{ <span class="m-3">@L["NoFeatureFoundMessage"]</span>
<span>@L["NoFeatureFoundMessage"]</span> }
} else
else {
{ <ModalBody MaxHeight="50">
<Tabs TabPosition="TabPosition.Start" Pills="true" @bind-SelectedTab="@SelectedTabName"> <Tabs TabPosition="TabPosition.Start" Pills="true" @bind-SelectedTab="@SelectedTabName">
<Items> <Items>
@foreach (var group in Groups) @foreach (var group in Groups)
@ -30,7 +30,7 @@
var index = i; var index = i;
<TabPanel Name="@GetNormalizedGroupName(Groups[index].Name)"> <TabPanel Name="@GetNormalizedGroupName(Groups[index].Name)">
<h4>@Groups[index].DisplayName</h4> <h4>@Groups[index].DisplayName</h4>
<hr class="mt-2 mb-3"/> <hr class="mt-2 mb-3" />
@foreach (var feature in Groups[index].Features) @foreach (var feature in Groups[index].Features)
{ {
<div class="mt-2"> <div class="mt-2">
@ -42,8 +42,8 @@
<Field Style="@GetFeatureStyles(feature)"> <Field Style="@GetFeatureStyles(feature)">
<FieldLabel>@feature.DisplayName</FieldLabel> <FieldLabel>@feature.DisplayName</FieldLabel>
<TextEdit Disabled="@disabled" <TextEdit Disabled="@disabled"
Text="@feature.Value" Text="@feature.Value"
TextChanged="@(async (v) => await OnFeatureValueChangedAsync(v, feature))"/> TextChanged="@(async (v) => await OnFeatureValueChangedAsync(v, feature))" />
@if (feature.Description != null) @if (feature.Description != null)
{ {
<div class="form-text">@feature.Description</div> <div class="form-text">@feature.Description</div>
@ -53,12 +53,12 @@
if (feature.ValueType is SelectionStringValueType) if (feature.ValueType is SelectionStringValueType)
{ {
var items = ((SelectionStringValueType) feature.ValueType).ItemSource.Items; var items = ((SelectionStringValueType)feature.ValueType).ItemSource.Items;
<Field Style="@GetFeatureStyles(feature)"> <Field Style="@GetFeatureStyles(feature)">
<FieldLabel>@feature.DisplayName</FieldLabel> <FieldLabel>@feature.DisplayName</FieldLabel>
<Select TValue="string" <Select TValue="string"
@bind-SelectedValue="@SelectionStringValues[feature.Name]"> @bind-SelectedValue="@SelectionStringValues[feature.Name]">
@foreach (var item in items) @foreach (var item in items)
{ {
<SelectItem Value="@item.Value"> <SelectItem Value="@item.Value">
@ -76,8 +76,7 @@
if (feature.ValueType is ToggleStringValueType) if (feature.ValueType is ToggleStringValueType)
{ {
<Field Style="@GetFeatureStyles(feature)"> <Field Style="@GetFeatureStyles(feature)">
<Check <Check TValue="bool" Checked="@ToggleValues[feature.Name]" CheckedChanged="@(async (v) => await OnSelectedValueChangedAsync(v, feature))">
TValue="bool" Checked="@ToggleValues[feature.Name]" CheckedChanged="@(async (v) => await OnSelectedValueChangedAsync(v, feature))">
@feature.DisplayName @feature.DisplayName
</Check> </Check>
@if (feature.Description != null) @if (feature.Description != null)
@ -94,12 +93,13 @@
} }
</Content> </Content>
</Tabs> </Tabs>
} </ModalBody>
</ModalBody> <ModalFooter>
<ModalFooter> <Button Color="Color.Primary" Clicked="@(async () => await DeleteAsync(ProviderName,ProviderKey))">@L["ResetToDefault"]</Button>
<Button Color="Color.Primary" Clicked="@(async () => await DeleteAsync(ProviderName,ProviderKey))">@L["ResetToDefault"]</Button> <Button Color="Color.Secondary" Clicked="CloseModal">@L["Cancel"]</Button>
<Button Color="Color.Secondary" Clicked="CloseModal">@L["Cancel"]</Button> <Button Color="Color.Primary" Clicked="SaveAsync">@L["Save"]</Button>
<Button Color="Color.Primary" Clicked="SaveAsync">@L["Save"]</Button> </ModalFooter>
</ModalFooter> }
</ModalContent> </ModalContent>
</Modal> </Modal>

3
modules/setting-management/src/Volo.Abp.SettingManagement.Domain.Shared/Volo/Abp/SettingManagement/SettingManagementFeatureDefinitionProvider.cs
View File

@ -17,7 +17,8 @@ public class SettingManagementFeatureDefinitionProvider : FeatureDefinitionProvi
"true", "true",
L("Feature:SettingManagementEnable"), L("Feature:SettingManagementEnable"),
L("Feature:SettingManagementEnableDescription"), L("Feature:SettingManagementEnableDescription"),
new ToggleStringValueType()); new ToggleStringValueType(),
isAvailableToHost: false);
settingEnableFeature.CreateChild( settingEnableFeature.CreateChild(
SettingManagementFeatures.AllowChangingEmailSettings, SettingManagementFeatures.AllowChangingEmailSettings,

2
modules/setting-management/src/Volo.Abp.SettingManagement.Web/Settings/EmailingPageContributor.cs
View File

@ -11,7 +11,7 @@ public class EmailingPageContributor : SettingPageContributorBase
{ {
public EmailingPageContributor() public EmailingPageContributor()
{ {
RequiredFeatures(SettingManagementFeatures.Enable); RequiredTenantSideFeatures(SettingManagementFeatures.Enable);
RequiredTenantSideFeatures(SettingManagementFeatures.AllowChangingEmailSettings); RequiredTenantSideFeatures(SettingManagementFeatures.AllowChangingEmailSettings);
RequiredPermissions(SettingManagementPermissions.Emailing); RequiredPermissions(SettingManagementPermissions.Emailing);
} }

Write Preview
Loading…
Cancel
Save