From 0355dc391fce03a4253043d1c6dad870a990d9ab Mon Sep 17 00:00:00 2001 From: adelikat Date: Tue, 1 Oct 2024 18:48:44 -0500 Subject: [PATCH] fix exception on getting formatStr, also put that logic in an extension method to be consistent --- TASVideos/Extensions/ViewDataDictionaryExtensions.cs | 3 +++ TASVideos/Pages/Shared/_Layout.cshtml | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/TASVideos/Extensions/ViewDataDictionaryExtensions.cs b/TASVideos/Extensions/ViewDataDictionaryExtensions.cs index 30cec757b..b58a652fe 100644 --- a/TASVideos/Extensions/ViewDataDictionaryExtensions.cs +++ b/TASVideos/Extensions/ViewDataDictionaryExtensions.cs @@ -51,6 +51,9 @@ public static void SetNavigation(this ViewDataDictionary viewData, int id, strin viewData["NavigationFmtStr"] = fmtStr; } + public static string GetNavigationFormatStr(this ViewDataDictionary viewData) + => viewData["NavigationFmtStr"] as string ?? ""; + public static string ActivePageClass(this ViewDataDictionary viewData, string page) { var activePage = viewData["ActivePage"] as string; diff --git a/TASVideos/Pages/Shared/_Layout.cshtml b/TASVideos/Pages/Shared/_Layout.cshtml index 60f329138..25cd8753b 100644 --- a/TASVideos/Pages/Shared/_Layout.cshtml +++ b/TASVideos/Pages/Shared/_Layout.cshtml @@ -89,7 +89,7 @@ var heading = ViewData.GetHeading(); int? prev = null; int? next = null; - string? fmtStr = ViewData["NavigationFmtStr"] as string; + string fmtStr = ViewData.GetNavigationFormatStr(); if (User.Has(PermissionTo.CatalogMovies)) { var id = ViewData.Int("NavigationId");