diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/wwwroot/libs/abp/aspnetcore-mvc-ui-theme-shared/jquery/jquery-extensions.js b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/wwwroot/libs/abp/aspnetcore-mvc-ui-theme-shared/jquery/jquery-extensions.js index 3b177ea3d5..2bae0cf8fc 100644 --- a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/wwwroot/libs/abp/aspnetcore-mvc-ui-theme-shared/jquery/jquery-extensions.js +++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared/wwwroot/libs/abp/aspnetcore-mvc-ui-theme-shared/jquery/jquery-extensions.js @@ -63,14 +63,14 @@ }); }; - var toCamelCase = function(str) { + var toCamelCase = function (str) { var regexs = [ /(^[A-Z])/, // first char of string /((\.)[A-Z])/ // first char after a dot (.) ]; regexs.forEach( - function(regex) { + function (regex) { var infLoopAvoider = 0; while (regex.test(str)) { @@ -115,7 +115,17 @@ } data.map(function (x) { - obj[x.name] = x.value; + //TODO: improve mapping. it only supports one level deep object. + var names = x.name.split("."); + if (names.length === 1 && !obj[names[0]]) { + obj[names[0]] = x.value; + } + else if (names.length === 2) { + if (!obj[names[0]]) { + obj[names[0]] = {}; + } + obj[names[0]][names[1]] = x.value; + } }); return obj; @@ -152,7 +162,7 @@ } }); - $(this).on('abp-ajax-success',function () { + $(this).on('abp-ajax-success', function () { formSaved = true; }); }; diff --git a/modules/setting-management/src/Volo.Abp.SettingManagement.Web/Navigation/SettingManagementMainMenuContributor.cs b/modules/setting-management/src/Volo.Abp.SettingManagement.Web/Navigation/SettingManagementMainMenuContributor.cs index 4bbb0f0bfd..9d622e6a7a 100644 --- a/modules/setting-management/src/Volo.Abp.SettingManagement.Web/Navigation/SettingManagementMainMenuContributor.cs +++ b/modules/setting-management/src/Volo.Abp.SettingManagement.Web/Navigation/SettingManagementMainMenuContributor.cs @@ -19,7 +19,6 @@ namespace Volo.Abp.SettingManagement.Web.Navigation return; } - var settingManagementPageOptions = context.ServiceProvider.GetRequiredService>().Value; var settingPageCreationContext = new SettingPageCreationContext(context.ServiceProvider); if ( @@ -42,7 +41,6 @@ namespace Volo.Abp.SettingManagement.Web.Navigation icon: "fa fa-cog" ) ); - } private async Task CheckAnyOfPagePermissionsGranted(