Open-source eCommerce platform for C# and ASP.NET Core 10 with MongoDB. Build multi-store shops and multi-vendor marketplaces with B2B/B2C, REST API, plugins, Vue 3 and Docker.
C# aspnet-corecsharpdockerdotnetecommerceecommerce-platformmongodbmulti-storemulti-vendornosqlonline-shopshoppingcart
Minor changes
KrzysztofPajakc13835209808
diff --git a/src/Web/Grand.Web.Admin/wwwroot/administration/admin.common.js b/src/Web/Grand.Web.Admin/wwwroot/administration/admin.common.jsindex ca22c9043..b7c0cc0a4 100644--- a/src/Web/Grand.Web.Admin/wwwroot/administration/admin.common.js+++ b/src/Web/Grand.Web.Admin/wwwroot/administration/admin.common.js@@ -67,11 +67,20 @@ function tabstrip_on_tab_select(e) {}-function tabstrip_on_tab_show(e) {- $('.k-state-active').find('[data-role="grid"]').each(function (x) {- var grid = $(this).data('kendoGrid');- grid.dataSource.page(1);- });+function tabstrip_on_tab_show(e, load) {+ var element = '.k-state-active';+ if (load === undefined) {+ $(e.contentElement).find('[data-role="grid"]').each(function (x) {+ var grid = $(this).data('kendoGrid');+ grid.dataSource.page(1);+ });+ }+ else {+ $(element).find('[data-role="grid"]').each(function (x) {+ var grid = $(this).data('kendoGrid');+ grid.dataSource.page(1);+ });+ }}diff --git a/src/Web/Grand.Web.Common/TagHelpers/Admin/AdminTabStripTagHelper.cs b/src/Web/Grand.Web.Common/TagHelpers/Admin/AdminTabStripTagHelper.csindex 6420cbd8f..87dda22e7 100644--- a/src/Web/Grand.Web.Common/TagHelpers/Admin/AdminTabStripTagHelper.cs+++ b/src/Web/Grand.Web.Common/TagHelpers/Admin/AdminTabStripTagHelper.cs@@ -79,7 +79,7 @@ namespace Grand.Web.Common.TagHelpers.Admin{sb.AppendLine("$(window).load(function() {");sb.AppendLine($" var selectedtab_{rnd} = $('#{Name}').data('kendoTabStrip').select(); ");- sb.AppendLine($" tabstrip_on_tab_show(selectedtab_{rnd}); ");+ sb.AppendLine($" tabstrip_on_tab_show(selectedtab_{rnd}, true); ");sb.AppendLine("});");}