Skip to content

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.

Fix component invoke for widget data

KrzysztofPajakafbbf0e3d018
diff --git a/src/Web/Grand.Web.Admin/Components/AdminWidget.cs b/src/Web/Grand.Web.Admin/Components/AdminWidget.cs
index 694702591..70f6ce704 100644
--- a/src/Web/Grand.Web.Admin/Components/AdminWidget.cs
+++ b/src/Web/Grand.Web.Admin/Components/AdminWidget.cs
@@ -38,11 +38,9 @@ namespace Grand.Web.Admin.Components
foreach (var item in widgets)
{
var viewComponentName = await item.GetPublicViewComponentName(widgetZone);
- var widgetModel = new AdminWidgetModel
- {
+ var widgetModel = new AdminWidgetModel {
WidgetZone = widgetZone,
ViewComponentName = viewComponentName,
- AdditionalData = additionalData
};
model.Add(widgetModel);
}
@@ -50,6 +48,11 @@ namespace Grand.Web.Admin.Components
if (!model.Any())
return Content("");
+ if (additionalData != null)
+ foreach (var item in model)
+ {
+ item.AdditionalData = additionalData;
+ }
return View(model);
}
diff --git a/src/Web/Grand.Web/Components/Widget.cs b/src/Web/Grand.Web/Components/Widget.cs
index d5a46ff28..3f9f7ff8c 100644
--- a/src/Web/Grand.Web/Components/Widget.cs
+++ b/src/Web/Grand.Web/Components/Widget.cs
@@ -39,11 +39,9 @@ namespace Grand.Web.ViewComponents
foreach (var widget in widgets)
{
var viewComponentName = await widget.GetPublicViewComponentName(widgetZone);
- var widgetModel = new WidgetModel
- {
+ var widgetModel = new WidgetModel {
ViewComponentName = viewComponentName,
- WidgetZone = widgetZone,
- AdditionalData = additionalData
+ WidgetZone = widgetZone
};
model.Add(widgetModel);
@@ -54,6 +52,12 @@ namespace Grand.Web.ViewComponents
if (!cachedModel.Any())
return Content("");
+ if (additionalData != null)
+ foreach (var item in cachedModel)
+ {
+ item.AdditionalData = additionalData;
+ }
+
return View(cachedModel);
}
}