Merge branch 'thelem-1899'

HTBox · Apr 16, 2018 · 5954014 · 5954014
2 parents aa08919 + 7a6d66d
commit 5954014
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 0 deletions.
diff --git a/...Admin/Controllers/EventAdminController.cs → ...reas/Admin/Controllers/EventController.cs b/...Admin/Controllers/EventAdminController.cs → ...reas/Admin/Controllers/EventController.cs
@@ -52,6 +52,11 @@ public async Task<IActionResult> Lister()
             var viewModel =
                 await _mediator.SendAsync(new EventListerQuery { UserId = _userAuthorizationService.AssociatedUserId });
 
+            if (viewModel.Count == 1 && viewModel.First().Events.Count == 1)
+            {
+                return Redirect(Url.Action("Details", "Event", new { id = viewModel.First().Events.First().EventId }));
+            }
+
             return View(viewModel);
         }
 

diff --git a/AllReadyApp/Web-App/AllReady/Views/Shared/_AdminNavigationPartial.cshtml b/AllReadyApp/Web-App/AllReady/Views/Shared/_AdminNavigationPartial.cshtml
@@ -22,6 +22,7 @@
                 <li><a asp-area="@AreaNames.Admin" asp-controller="UnlinkedRequest" asp-action="List">Unlinked Requests</a></li>
                 <li><a asp-area="Admin" asp-controller="Invite" asp-action="Index">Invites</a></li>
             }
+            <li><a asp-area="@AreaNames.Admin" asp-controller="Event" asp-action="Lister">Events</a></li>
             <li><a asp-area="@AreaNames.Admin" asp-controller="Skill" asp-action="Index">Skills</a></li>
             @if (User.IsUserType(UserType.SiteAdmin))
             {