Skip to content

Commit

Permalink
Merge pull request #15216 from abpframework/fix-host-settings-feature
Browse files Browse the repository at this point in the history
Setting management page should always visible to host side
  • Loading branch information
muhammedaltug authored Dec 27, 2022
2 parents 7343e6b + 37b1ad6 commit b421b7a
Show file tree
Hide file tree
Showing 3 changed files with 25 additions and 24 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,15 @@
<ModalContent Size="ModalSize.Large" Centered="true">
<ModalHeader>
<ModalTitle>@L["Features"]</ModalTitle>
<CloseButton Clicked="CloseModal"/>
<CloseButton Clicked="CloseModal" />
</ModalHeader>
<ModalBody MaxHeight="50">
@if (Groups == null || !Groups.Any())
{
<span>@L["NoFeatureFoundMessage"]</span>
}
else
{
@if (Groups == null || !Groups.Any())
{
<span class="m-3">@L["NoFeatureFoundMessage"]</span>
}
else
{
<ModalBody MaxHeight="50">
<Tabs TabPosition="TabPosition.Start" Pills="true" @bind-SelectedTab="@SelectedTabName">
<Items>
@foreach (var group in Groups)
Expand All @@ -30,7 +30,7 @@
var index = i;
<TabPanel Name="@GetNormalizedGroupName(Groups[index].Name)">
<h4>@Groups[index].DisplayName</h4>
<hr class="mt-2 mb-3"/>
<hr class="mt-2 mb-3" />
@foreach (var feature in Groups[index].Features)
{
<div class="mt-2">
Expand All @@ -42,8 +42,8 @@
<Field Style="@GetFeatureStyles(feature)">
<FieldLabel>@feature.DisplayName</FieldLabel>
<TextEdit Disabled="@disabled"
Text="@feature.Value"
TextChanged="@(async (v) => await OnFeatureValueChangedAsync(v, feature))"/>
Text="@feature.Value"
TextChanged="@(async (v) => await OnFeatureValueChangedAsync(v, feature))" />
@if (feature.Description != null)
{
<div class="form-text">@feature.Description</div>
Expand All @@ -53,12 +53,12 @@

if (feature.ValueType is SelectionStringValueType)
{
var items = ((SelectionStringValueType) feature.ValueType).ItemSource.Items;
var items = ((SelectionStringValueType)feature.ValueType).ItemSource.Items;

<Field Style="@GetFeatureStyles(feature)">
<FieldLabel>@feature.DisplayName</FieldLabel>
<Select TValue="string"
@bind-SelectedValue="@SelectionStringValues[feature.Name]">
@bind-SelectedValue="@SelectionStringValues[feature.Name]">
@foreach (var item in items)
{
<SelectItem Value="@item.Value">
Expand All @@ -76,8 +76,7 @@
if (feature.ValueType is ToggleStringValueType)
{
<Field Style="@GetFeatureStyles(feature)">
<Check
TValue="bool" Checked="@ToggleValues[feature.Name]" CheckedChanged="@(async (v) => await OnSelectedValueChangedAsync(v, feature))">
<Check TValue="bool" Checked="@ToggleValues[feature.Name]" CheckedChanged="@(async (v) => await OnSelectedValueChangedAsync(v, feature))">
@feature.DisplayName
</Check>
@if (feature.Description != null)
Expand All @@ -94,12 +93,13 @@
}
</Content>
</Tabs>
}
</ModalBody>
<ModalFooter>
<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.Primary" Clicked="SaveAsync">@L["Save"]</Button>
</ModalFooter>
</ModalBody>
<ModalFooter>
<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.Primary" Clicked="SaveAsync">@L["Save"]</Button>
</ModalFooter>
}

</ModalContent>
</Modal>
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,8 @@ public override void Define(IFeatureDefinitionContext context)
"true",
L("Feature:SettingManagementEnable"),
L("Feature:SettingManagementEnableDescription"),
new ToggleStringValueType());
new ToggleStringValueType(),
isAvailableToHost: false);

settingEnableFeature.CreateChild(
SettingManagementFeatures.AllowChangingEmailSettings,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ public class EmailingPageContributor : SettingPageContributorBase
{
public EmailingPageContributor()
{
RequiredFeatures(SettingManagementFeatures.Enable);
RequiredTenantSideFeatures(SettingManagementFeatures.Enable);
RequiredTenantSideFeatures(SettingManagementFeatures.AllowChangingEmailSettings);
RequiredPermissions(SettingManagementPermissions.Emailing);
}
Expand Down

0 comments on commit b421b7a

Please sign in to comment.