From 6130b475da98bfe2c2072c7741626560636b203d Mon Sep 17 00:00:00 2001 From: Anders Bjerner Date: Fri, 1 Feb 2019 18:47:17 +0100 Subject: [PATCH 1/3] IDashboard -> IDashboardSlim --- src/Umbraco.Web/Editors/EditorModelEventManager.cs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Umbraco.Web/Editors/EditorModelEventManager.cs b/src/Umbraco.Web/Editors/EditorModelEventManager.cs index c3a7d128ec..74ebe51a99 100644 --- a/src/Umbraco.Web/Editors/EditorModelEventManager.cs +++ b/src/Umbraco.Web/Editors/EditorModelEventManager.cs @@ -15,9 +15,9 @@ namespace Umbraco.Web.Editors public static event TypedEventHandler> SendingMediaModel; public static event TypedEventHandler> SendingMemberModel; public static event TypedEventHandler> SendingUserModel; - public static event TypedEventHandler>>> SendingDashboardModel; + public static event TypedEventHandler>>> SendingDashboardModel; - private static void OnSendingDashboardModel(HttpActionExecutedContext sender, EditorModelEventArgs>> e) + private static void OnSendingDashboardModel(HttpActionExecutedContext sender, EditorModelEventArgs>> e) { var handler = SendingDashboardModel; handler?.Invoke(sender, e); @@ -67,7 +67,7 @@ namespace Umbraco.Web.Editors OnSendingUserModel(sender, new EditorModelEventArgs(e)); if (e.Model is IEnumerable) - OnSendingDashboardModel(sender, new EditorModelEventArgs>>(e)); + OnSendingDashboardModel(sender, new EditorModelEventArgs>>(e)); } } } From 0636616a6b8a1f928b5e2ce1bb8cbe8fc901658e Mon Sep 17 00:00:00 2001 From: Anders Bjerner Date: Tue, 19 Feb 2019 22:21:13 +0100 Subject: [PATCH 2/3] #H5IS --- src/Umbraco.Web/Editors/EditorModelEventManager.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Umbraco.Web/Editors/EditorModelEventManager.cs b/src/Umbraco.Web/Editors/EditorModelEventManager.cs index 74ebe51a99..b61a359e83 100644 --- a/src/Umbraco.Web/Editors/EditorModelEventManager.cs +++ b/src/Umbraco.Web/Editors/EditorModelEventManager.cs @@ -66,7 +66,7 @@ namespace Umbraco.Web.Editors if (e.Model is UserDisplay) OnSendingUserModel(sender, new EditorModelEventArgs(e)); - if (e.Model is IEnumerable) + if (e.Model is IEnumerable>) OnSendingDashboardModel(sender, new EditorModelEventArgs>>(e)); } } From 4d71c5550b0eb36f30932acd94879e37a31b3ba9 Mon Sep 17 00:00:00 2001 From: Anders Bjerner Date: Tue, 19 Feb 2019 22:36:12 +0100 Subject: [PATCH 3/3] Should be returned as a list - otherwise we'll get a new collection and new tab objects each time we iterate over it --- src/Umbraco.Web/Editors/DashboardController.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Umbraco.Web/Editors/DashboardController.cs b/src/Umbraco.Web/Editors/DashboardController.cs index 8ae59b974c..a43d0c4e9c 100644 --- a/src/Umbraco.Web/Editors/DashboardController.cs +++ b/src/Umbraco.Web/Editors/DashboardController.cs @@ -215,7 +215,7 @@ namespace Umbraco.Web.Editors Alias = y.Alias, View = y.View }) - }); + }).ToList(); } } }