Skip to content

Commit 34e13d2

Browse files
committed
Revert "Add prev/next ID buttons for game groups (#2000)"
This reverts commit e079b4a.
1 parent 78c9e1f commit 34e13d2

File tree

5 files changed

+6
-11
lines changed

5 files changed

+6
-11
lines changed

TASVideos/Extensions/ViewDataDictionaryExtensions.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -45,10 +45,10 @@ public static string GetHeading(this ViewDataDictionary viewData)
4545
public static void SetWikiPage(this ViewDataDictionary viewData, IWikiPage wikiPage)
4646
=> viewData["WikiPage"] = wikiPage;
4747

48-
public static void SetNavigation(this ViewDataDictionary viewData, int id, string fmtStr = "{0}")
48+
public static void SetNavigation(this ViewDataDictionary viewData, int id, string suffix)
4949
{
5050
viewData["NavigationId"] = id;
51-
viewData["NavigationFmtStr"] = fmtStr;
51+
viewData["NavigationSuffix"] = suffix;
5252
}
5353

5454
public static string ActivePageClass(this ViewDataDictionary viewData, string page)

TASVideos/Pages/GameGroups/Index.cshtml

-4
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,6 @@
22
@model IndexModel
33
@{
44
ViewData.SetTitle($"Games for Group: {Model.Name}");
5-
if (int.TryParse(Model.Id, out var id))
6-
{
7-
ViewData.SetNavigation(id, "/GameGroups/{0}");
8-
}
95
}
106

117
<warning-alert condition="!Model.Games.Any()">

TASVideos/Pages/Games/Index.cshtml

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020

2121
if (int.TryParse(Model.Id, out int id))
2222
{
23-
ViewData.SetNavigation(id, "/{0}G");
23+
ViewData.SetNavigation(id, "G");
2424
}
2525
}
2626

TASVideos/Pages/Shared/_Layout.cshtml

+2-3
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,6 @@
8989
var heading = ViewData.GetHeading();
9090
int? prev = null;
9191
int? next = null;
92-
string? fmtStr = ViewData["NavigationFmtStr"] as string;
9392
if (User.Has(PermissionTo.CatalogMovies))
9493
{
9594
var id = ViewData.Int("NavigationId");
@@ -102,7 +101,7 @@
102101

103102
<div class="container mb-2">
104103
<h1 class="page-title card card-body d-block">
105-
<a condition="prev.HasValue" href="@string.Format(fmtStr!, prev)"><i class="fa fa-arrow-left"></i></a>
104+
<a condition="prev.HasValue" href="@(prev + ViewData["NavigationSuffix"]?.ToString())"><i class="fa fa-arrow-left"></i></a>
106105
@if (IsSectionDefined("PageTitle"))
107106
{
108107
@await RenderSectionAsync("PageTitle")
@@ -111,7 +110,7 @@
111110
{
112111
@heading
113112
}
114-
<a condition="next.HasValue" class="float-end" href="@string.Format(fmtStr!, next)"><i class="fa fa-arrow-right"></i></a>
113+
<a condition="next.HasValue" class="float-end" href="@(next + ViewData["NavigationSuffix"]?.ToString())"><i class="fa fa-arrow-right"></i></a>
115114
</h1>
116115
</div>
117116
}

TASVideos/Pages/Submissions/View.cshtml

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
@{
55
ViewData.SetTitle($"{Model.Submission.Title} - Submission #{Model.Id}");
66
ViewData.SetHeading($"Submission {Model.Submission.Title}");
7-
ViewData.SetNavigation(Model.Id, "/{0}S");
7+
ViewData.SetNavigation(Model.Id, "S");
88
bool hasEncode = !string.IsNullOrWhiteSpace(Model.Submission.EncodeEmbedLink);
99
bool canEdit = User.Has(PermissionTo.EditSubmissions)
1010
|| (Model.CanEdit && User.Has(PermissionTo.SubmitMovies));

0 commit comments

Comments
 (0)