From 395faeb4b82ff9c20f12d541357487c100a53934 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Philipp=20H=C3=A4felfinger?= Date: Fri, 25 Jan 2019 23:39:09 +0100 Subject: [PATCH] some cleanups --- Tv7Playlist/Controllers/HomeController.cs | 19 +++++++------------ Tv7Playlist/Views/Home/Index.cshtml | 6 +++--- Tv7Playlist/Views/Shared/_Layout.cshtml | 2 +- 3 files changed, 11 insertions(+), 16 deletions(-) diff --git a/Tv7Playlist/Controllers/HomeController.cs b/Tv7Playlist/Controllers/HomeController.cs index d2083ea..f2d545c 100644 --- a/Tv7Playlist/Controllers/HomeController.cs +++ b/Tv7Playlist/Controllers/HomeController.cs @@ -1,14 +1,9 @@ using System; -using System.Collections.Immutable; using System.Diagnostics; using System.Linq; -using System.Net.Http; using System.Threading.Tasks; using Microsoft.AspNetCore.Mvc; using Microsoft.EntityFrameworkCore; -using Microsoft.Extensions.Configuration; -using Microsoft.Extensions.Logging; -using Tv7Playlist.Core; using Tv7Playlist.Data; using Tv7Playlist.Models; @@ -16,17 +11,14 @@ namespace Tv7Playlist.Controllers { public class HomeController : Controller { - private readonly ILogger _logger; - private readonly IAppConfig _appConfig; private readonly PlaylistContext _playlistContext; - public HomeController(ILogger logger, IAppConfig appConfig, PlaylistContext playlistContext) + public HomeController(PlaylistContext playlistContext) { - _logger = logger ?? throw new ArgumentNullException(nameof(logger)); - _appConfig = appConfig ?? throw new ArgumentNullException(nameof(appConfig)); _playlistContext = playlistContext ?? throw new ArgumentNullException(nameof(playlistContext)); } + [HttpGet] public async Task Index() { var playlistEntries = await _playlistContext.PlaylistEntries.AsNoTracking().OrderBy(e => e.TrackNumber).ToListAsync(); @@ -35,10 +27,13 @@ namespace Tv7Playlist.Controllers return View(model); } + [HttpGet] [ResponseCache(Duration = 0, Location = ResponseCacheLocation.None, NoStore = true)] public IActionResult Error() { - return View(new ErrorViewModel {RequestId = Activity.Current?.Id ?? HttpContext.TraceIdentifier}); + var errorViewModel = new ErrorViewModel {RequestId = Activity.Current?.Id ?? HttpContext.TraceIdentifier}; + + return View(errorViewModel); } } -} +} \ No newline at end of file diff --git a/Tv7Playlist/Views/Home/Index.cshtml b/Tv7Playlist/Views/Home/Index.cshtml index f3240ef..7bfee46 100644 --- a/Tv7Playlist/Views/Home/Index.cshtml +++ b/Tv7Playlist/Views/Home/Index.cshtml @@ -6,9 +6,9 @@
- + @@ -21,9 +21,9 @@ foreach (var track in Model.PlaylistEntries) { - - + + diff --git a/Tv7Playlist/Views/Shared/_Layout.cshtml b/Tv7Playlist/Views/Shared/_Layout.cshtml index 2cc6c7c..efdea8a 100644 --- a/Tv7Playlist/Views/Shared/_Layout.cshtml +++ b/Tv7Playlist/Views/Shared/_Layout.cshtml @@ -3,7 +3,7 @@ - @ViewData["Title"] - Tv7Playlist + @ViewData["Title"]
Position Number Number overridePosition Name Name override Enabled
@track.Position @track.TrackNumber@track.TrackNumberOverride@(track.TrackNumberOverride==0?string.Empty:track.TrackNumberOverride.ToString())@track.Position @track.Name @track.NameOverride @track.IsEnabled