From 9c5fcf84fe2860d60877ec398f4a06ce328bee3b Mon Sep 17 00:00:00 2001 From: malik masis Date: Wed, 23 Nov 2022 19:16:19 +0300 Subject: [PATCH 1/2] fixed blazor side --- .../Components/FeatureManagementModal.razor.cs | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/modules/feature-management/src/Volo.Abp.FeatureManagement.Blazor/Components/FeatureManagementModal.razor.cs b/modules/feature-management/src/Volo.Abp.FeatureManagement.Blazor/Components/FeatureManagementModal.razor.cs index 54823f89e8..a1117972a1 100644 --- a/modules/feature-management/src/Volo.Abp.FeatureManagement.Blazor/Components/FeatureManagementModal.razor.cs +++ b/modules/feature-management/src/Volo.Abp.FeatureManagement.Blazor/Components/FeatureManagementModal.razor.cs @@ -116,12 +116,21 @@ public partial class FeatureManagementModal public virtual async Task DeleteAsync([NotNull] string providerName, string providerKey = null) { - if (!await Message.Confirm(L["AreYouSureToResetToDefault"])) + try { - return; + if (!await Message.Confirm(L["AreYouSureToResetToDefault"])) + { + return; + } + await FeatureAppService.DeleteAsync(ProviderName, ProviderKey); + await Message.Success(L["ResetedToDefault"]); + + await CloseModal(); + } + catch (Exception ex) + { + await HandleErrorAsync(ex); } - await FeatureAppService.DeleteAsync(ProviderName, ProviderKey); - await Message.Success(L["ResetedToDefault"]); } protected virtual string GetNormalizedGroupName(string name) From 36205eb94d92fdfabf93f930907ee7d7edd035bd Mon Sep 17 00:00:00 2001 From: malik masis Date: Wed, 23 Nov 2022 19:16:32 +0300 Subject: [PATCH 2/2] Fixed the mvc side --- .../Pages/FeatureManagement/FeatureManagementModal.cshtml | 5 ++++- .../Pages/FeatureManagement/feature-management-modal.js | 5 +++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/modules/feature-management/src/Volo.Abp.FeatureManagement.Web/Pages/FeatureManagement/FeatureManagementModal.cshtml b/modules/feature-management/src/Volo.Abp.FeatureManagement.Web/Pages/FeatureManagement/FeatureManagementModal.cshtml index 4293620b72..c076f6fa19 100644 --- a/modules/feature-management/src/Volo.Abp.FeatureManagement.Web/Pages/FeatureManagement/FeatureManagementModal.cshtml +++ b/modules/feature-management/src/Volo.Abp.FeatureManagement.Web/Pages/FeatureManagement/FeatureManagementModal.cshtml @@ -18,8 +18,11 @@ return new HtmlLocalizer(localizer); } } + + +
- + @if (Model.FeatureListResultDto != null && Model.FeatureListResultDto.Groups.Any()) { diff --git a/modules/feature-management/src/Volo.Abp.FeatureManagement.Web/Pages/FeatureManagement/feature-management-modal.js b/modules/feature-management/src/Volo.Abp.FeatureManagement.Web/Pages/FeatureManagement/feature-management-modal.js index e6efe2e63d..88e95b28f5 100644 --- a/modules/feature-management/src/Volo.Abp.FeatureManagement.Web/Pages/FeatureManagement/feature-management-modal.js +++ b/modules/feature-management/src/Volo.Abp.FeatureManagement.Web/Pages/FeatureManagement/feature-management-modal.js @@ -3,8 +3,6 @@ var abp = abp || {}; abp.modals = abp.modals || {}; let l = abp.localization.getResource("AbpFeatureManagement"); - - abp.modals.FeatureManagement = function () { abp.ResourceLoader.loadScript('/client-proxies/featureManagement-proxy.js'); $('#ResetToDefaults').click(function (e) { @@ -16,6 +14,9 @@ var abp = abp || {}; volo.abp.featureManagement.features.delete(providerName, prodiverKey).then(function () { abp.notify.success(l('ResetedToDefault')); }); + setTimeout(function () { + $('#featureManagmentModal').modal('hide'); + }, 500); } }); });