Browse Source
Merge pull request #20080 from abpframework/8.2-allowing-overriding-features
Allow overriding features from Edition
pull/20085/head
oykuermann
2 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with
2 additions and
8 deletions
-
modules/feature-management/src/Volo.Abp.FeatureManagement.Web/Pages/FeatureManagement/FeatureManagementModal.cshtml
-
modules/feature-management/src/Volo.Abp.FeatureManagement.Web/Pages/FeatureManagement/FeatureManagementModal.cshtml.cs
|
|
|
@ -43,7 +43,6 @@ |
|
|
|
@for (var j = 0; j < featureGroup.Features.Count; j++) |
|
|
|
{ |
|
|
|
var feature = featureGroup.Features[j]; |
|
|
|
var disabled = Model.IsDisabled(feature.Provider.Name); |
|
|
|
<div class="mt-2"> |
|
|
|
|
|
|
|
<input type="text" abp-id-name="@Model.FeatureGroups[i].Features[j].Type" value="@feature.ValueType?.Name" hidden/> |
|
|
|
@ -52,12 +51,13 @@ |
|
|
|
{ |
|
|
|
<abp-input asp-for="@feature.Value" |
|
|
|
type="checkbox" |
|
|
|
class="d-inline" |
|
|
|
abp-id-name="@Model.FeatureGroups[i].Features[j].BoolValue" |
|
|
|
label="@feature.DisplayName" |
|
|
|
disabled="@disabled" |
|
|
|
group-data-feature-name="@feature.Name" |
|
|
|
group-data-parent-name="@(feature.ParentName ?? "")" |
|
|
|
group-style="margin-inline-start: @(feature.Depth * 20)px"/> |
|
|
|
|
|
|
|
@if (feature.Description != null) |
|
|
|
{ |
|
|
|
<div class="form-text" style="margin-inline-start: @(feature.Depth * 20)px">@feature.Description</div> |
|
|
|
@ -76,7 +76,6 @@ |
|
|
|
<abp-input asp-for="@feature.Value" |
|
|
|
label="@feature.DisplayName" |
|
|
|
abp-id-name="@Model.FeatureGroups[i].Features[j].Value" |
|
|
|
disabled="@disabled" |
|
|
|
type="@type" |
|
|
|
group-data-feature-name="@feature.Name" |
|
|
|
group-data-parent-name="@(feature.ParentName ?? "")" |
|
|
|
|
|
|
|
@ -77,11 +77,6 @@ public class FeatureManagementModal : AbpPageModel |
|
|
|
return NoContent(); |
|
|
|
} |
|
|
|
|
|
|
|
public virtual bool IsDisabled(string providerName) |
|
|
|
{ |
|
|
|
return providerName != ProviderName && providerName != DefaultValueFeatureValueProvider.ProviderName; |
|
|
|
} |
|
|
|
|
|
|
|
public class FeatureGroupViewModel |
|
|
|
{ |
|
|
|
public List<FeatureViewModel> Features { get; set; } |
|
|
|
|
