Fixed topic widgets rendering with activated OutputCache

muratcakir · muratcakir · commit 696e40dd94e4 · 2017-05-25T02:04:31.000+02:00
diff --git a/src/Libraries/SmartStore.Core/Caching/OutputCache/DisplayControl.cs b/src/Libraries/SmartStore.Core/Caching/OutputCache/DisplayControl.cs
@@ -236,11 +236,7 @@ public virtual IEnumerable<string> GetCacheControlTagsFor(BaseEntity entity)
 			}
 			else if (type == typeof(Topic))
 			{
-				var topic = ((Topic)entity);
-				if (!topic.RenderAsWidget)
-				{
-					yield return "t" + topic.Id;
-				}
+				yield return "t" + entity.Id;
 			}
 		}
 
diff --git a/src/Presentation/SmartStore.Web/Infrastructure/DefaultWidgetSelector.cs b/src/Presentation/SmartStore.Web/Infrastructure/DefaultWidgetSelector.cs
@@ -15,6 +15,7 @@
 using SmartStore.Web.Framework.UI;
 using SmartStore.Web.Infrastructure.Cache;
 using SmartStore.Web.Models.Topics;
+using SmartStore.Core.Domain.Topics;
 
 namespace SmartStore.Web.Infrastructure
 {  
@@ -145,6 +146,7 @@ public virtual IEnumerable<WidgetRouteInfo> GetWidgets(string widgetZone, object
 									} }
 								}
 							};
+
 							map.Add(zone, routeInfo);
 						}
 					}
@@ -186,6 +188,13 @@ public virtual IEnumerable<WidgetRouteInfo> GetWidgets(string widgetZone, object
 				var zoneWidgets = topicsByZone[widgetZone.ToLower()];
 				foreach (var topicWidget in zoneWidgets)
 				{
+					// Handle OC announcement
+					var topicWidgetModel = topicWidget.RouteValues["model"] as TopicWidgetModel;
+					if (topicWidgetModel != null)
+					{
+						_services.DisplayControl.Announce(new Topic { Id = topicWidgetModel.Id });
+					}
+
 					yield return topicWidget;
 				}
 			}
@@ -206,21 +215,19 @@ public virtual IEnumerable<WidgetRouteInfo> GetWidgets(string widgetZone, object
 
 			#endregion
         }
-
-		class TopicWidgetStub
-		{
-			public int Id { get; set; }
-			public string[] WidgetZones { get; set; }
-			public string SystemName { get; set; }
-			public bool WrapContent { get; set; }
-			public bool ShowTitle { get; set; }
-			public bool Bordered { get; set; }
-			public string Title { get; set; }
-            public string TitleTag { get; set; }
-			public string Body { get; set; }
-			public int Priority { get; set; }
-		}
-
     }
 
+	public class TopicWidgetStub
+	{
+		public int Id { get; set; }
+		public string[] WidgetZones { get; set; }
+		public string SystemName { get; set; }
+		public bool WrapContent { get; set; }
+		public bool ShowTitle { get; set; }
+		public bool Bordered { get; set; }
+		public string Title { get; set; }
+		public string TitleTag { get; set; }
+		public string Body { get; set; }
+		public int Priority { get; set; }
+	}
 }
diff --git a/src/Presentation/SmartStore.Web/Views/Topic/Partials/TopicWidget.cshtml b/src/Presentation/SmartStore.Web/Views/Topic/Partials/TopicWidget.cshtml
@@ -1,4 +1,5 @@
 ﻿@model TopicWidgetModel
+
 @using SmartStore.Web.Models.Topics;
 
 @{
diff --git a/src/Presentation/SmartStore.Web/Views/Widget/Partials/WidgetsByZone.cshtml b/src/Presentation/SmartStore.Web/Views/Widget/Partials/WidgetsByZone.cshtml
@@ -1,4 +1,5 @@
 ﻿@model WidgetZoneModel
+
 @using SmartStore.Web.Framework.UI;
 
 @foreach (var widget in Model.Widgets) {

Original file line number	Diff line number	Diff line change
`@@ -236,11 +236,7 @@ public virtual IEnumerable<string> GetCacheControlTagsFor(BaseEntity entity)`
`236`	`236`	`}`
`237`	`237`	`else if (type == typeof(Topic))`
`238`	`238`	`{`
`239`		`- var topic = ((Topic)entity);`
`240`		`- if (!topic.RenderAsWidget)`
`241`		`- {`
`242`		`- yield return "t" + topic.Id;`
`243`		`- }`
	`239`	`+ yield return "t" + entity.Id;`
`244`	`240`	`}`
`245`	`241`	`}`
`246`	`242`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`@model TopicWidgetModel`
	`2`	`+`
`2`	`3`	`@using SmartStore.Web.Models.Topics;`
`3`	`4`
`4`	`5`	`@{`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`@model WidgetZoneModel`
	`2`	`+`
`2`	`3`	`@using SmartStore.Web.Framework.UI;`
`3`	`4`
`4`	`5`	`@foreach (var widget in Model.Widgets) {`