diff --git a/modules/setting-management/src/Volo.Abp.SettingManagement.Web/AbpSettingManagementWebModule.cs b/modules/setting-management/src/Volo.Abp.SettingManagement.Web/AbpSettingManagementWebModule.cs index 61874c0b6b..b544d4a7bf 100644 --- a/modules/setting-management/src/Volo.Abp.SettingManagement.Web/AbpSettingManagementWebModule.cs +++ b/modules/setting-management/src/Volo.Abp.SettingManagement.Web/AbpSettingManagementWebModule.cs @@ -1,7 +1,5 @@ -using Microsoft.AspNetCore.Mvc.RazorPages; -using Microsoft.Extensions.DependencyInjection; +using Microsoft.Extensions.DependencyInjection; using Volo.Abp.AspNetCore.Mvc.Localization; -using Volo.Abp.AspNetCore.Mvc.UI.Bundling; using Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared; using Volo.Abp.AutoMapper; using Volo.Abp.Http.ProxyScripting.Generators.JQuery; @@ -29,7 +27,7 @@ public class AbpSettingManagementWebModule : AbpModule { options.AddAssemblyResource(typeof(AbpSettingManagementResource), typeof(AbpSettingManagementWebModule).Assembly); }); - + PreConfigure(mvcBuilder => { mvcBuilder.AddApplicationPartIfNotExists(typeof(AbpSettingManagementWebModule).Assembly); @@ -54,21 +52,11 @@ public class AbpSettingManagementWebModule : AbpModule options.FileSets.AddEmbedded(); }); - Configure(options => - { - options.ScriptBundles - .Configure(typeof(IndexModel).FullName, - configuration => - { - configuration.AddFiles("/Pages/SettingManagement/Components/EmailSettingGroup/Default.js"); - }); - }); - Configure(options => { options.DisableModule(SettingManagementRemoteServiceConsts.ModuleName); }); - + context.Services.AddAutoMapperObjectMapper(); Configure(options => { diff --git a/modules/setting-management/src/Volo.Abp.SettingManagement.Web/Pages/SettingManagement/Components/EmailSettingGroup/Default.cshtml b/modules/setting-management/src/Volo.Abp.SettingManagement.Web/Pages/SettingManagement/Components/EmailSettingGroup/Default.cshtml index caca43c1e1..a5e0275535 100644 --- a/modules/setting-management/src/Volo.Abp.SettingManagement.Web/Pages/SettingManagement/Components/EmailSettingGroup/Default.cshtml +++ b/modules/setting-management/src/Volo.Abp.SettingManagement.Web/Pages/SettingManagement/Components/EmailSettingGroup/Default.cshtml @@ -6,6 +6,8 @@ @inject IPermissionChecker PermissionChecker @model Volo.Abp.SettingManagement.Web.Pages.SettingManagement.Components.EmailSettingGroup.EmailSettingGroupViewComponent.UpdateEmailSettingsViewModel + +
@@ -36,4 +38,4 @@ -
\ No newline at end of file + diff --git a/modules/setting-management/src/Volo.Abp.SettingManagement.Web/Pages/SettingManagement/Components/EmailSettingGroup/Default.js b/modules/setting-management/src/Volo.Abp.SettingManagement.Web/Pages/SettingManagement/Components/EmailSettingGroup/Default.js index aeced4f4dc..ae8e694de3 100644 --- a/modules/setting-management/src/Volo.Abp.SettingManagement.Web/Pages/SettingManagement/Components/EmailSettingGroup/Default.js +++ b/modules/setting-management/src/Volo.Abp.SettingManagement.Web/Pages/SettingManagement/Components/EmailSettingGroup/Default.js @@ -8,46 +8,44 @@ var l = abp.localization.getResource('AbpSettingManagement'); - abp.event.on('Abp.SettingManagement.View.Render.Volo.Abp.EmailSetting', function (eventData) { - $("#EmailSettingsForm").on('submit', function (event) { - event.preventDefault(); + $("#EmailSettingsForm").on('submit', function (event) { + event.preventDefault(); - if (!$(this).valid()) { - return; - } - - var form = $(this).serializeFormToObject(); - volo.abp.settingManagement.emailSettings.update(form).then(function (result) { - $(document).trigger("AbpSettingSaved"); - }); + if (!$(this).valid()) { + return; + } + var form = $(this).serializeFormToObject(); + volo.abp.settingManagement.emailSettings.update(form).then(function (result) { + $(document).trigger("AbpSettingSaved"); }); - $('#SmtpUseDefaultCredentials').change(function () { - if (this.checked) { - $('#HideSectionWhenUseDefaultCredentialsIsChecked').slideUp(); - } else { - $('#HideSectionWhenUseDefaultCredentialsIsChecked').slideDown(); - } - }); + }); - _sendTestEmailModal.onOpen(function () { - var $form = _sendTestEmailModal.getForm(); - _sendTestEmailModal.getForm().off('abp-ajax-success'); + $('#SmtpUseDefaultCredentials').change(function () { + if (this.checked) { + $('#HideSectionWhenUseDefaultCredentialsIsChecked').slideUp(); + } else { + $('#HideSectionWhenUseDefaultCredentialsIsChecked').slideDown(); + } + }); - $form.on('abp-ajax-success', function () { - _sendTestEmailModal.setResult(); - }); - }) + _sendTestEmailModal.onOpen(function () { + var $form = _sendTestEmailModal.getForm(); + _sendTestEmailModal.getForm().off('abp-ajax-success'); - _sendTestEmailModal.onResult(function () { - abp.notify.success(l('SuccessfullySent')); + $form.on('abp-ajax-success', function () { + _sendTestEmailModal.setResult(); }); + }) + + _sendTestEmailModal.onResult(function () { + abp.notify.success(l('SuccessfullySent')); + }); - $("#SendTestEmailButton").click(function (e) { - e.preventDefault(); - _sendTestEmailModal.open(); - }); + $("#SendTestEmailButton").click(function (e) { + e.preventDefault(); + _sendTestEmailModal.open(); }); }); diff --git a/modules/setting-management/src/Volo.Abp.SettingManagement.Web/Pages/SettingManagement/Index.js b/modules/setting-management/src/Volo.Abp.SettingManagement.Web/Pages/SettingManagement/Index.js index 82e075b45e..07b40c2c38 100644 --- a/modules/setting-management/src/Volo.Abp.SettingManagement.Web/Pages/SettingManagement/Index.js +++ b/modules/setting-management/src/Volo.Abp.SettingManagement.Web/Pages/SettingManagement/Index.js @@ -21,7 +21,6 @@ $('#tab-content').children('.tab-pane').removeClass('show').removeClass('active'); _this.attr('data-bs-target', '#' + $.escapeSelector($.escapeSelector(id))); $('#tab-content').append('
' + response + '
'); - abp.event.trigger('Abp.SettingManagement.View.Render.' + id); }) }); }).first().click();