From a2f44cf8d232237de60671c8f98ef96b03cd782f Mon Sep 17 00:00:00 2001 From: Jamie Rees Date: Tue, 15 Mar 2016 19:14:27 +0000 Subject: [PATCH] Finished the notes! Resolved #7 --- PlexRequests.Api.Models/Sonarr/SystemStatus.cs | 7 +++++-- PlexRequests.Api/ApiRequest.cs | 13 ++++++++++--- PlexRequests.Core/StatusChecker.cs | 4 ++-- PlexRequests.UI/Content/requests.js | 2 +- .../Modules/ApplicationTesterModule.cs | 2 +- PlexRequests.UI/Modules/LoginModule.cs | 6 ++++-- PlexRequests.UI/Modules/RequestsModule.cs | 4 ++-- PlexRequests.UI/Program.cs | 4 ++-- PlexRequests.UI/Views/Admin/_Sidebar.cshtml | 16 ++++++++-------- PlexRequests.UI/Views/Requests/Index.cshtml | 10 +++++----- 10 files changed, 40 insertions(+), 28 deletions(-) diff --git a/PlexRequests.Api.Models/Sonarr/SystemStatus.cs b/PlexRequests.Api.Models/Sonarr/SystemStatus.cs index 5f04c607a..19d822805 100644 --- a/PlexRequests.Api.Models/Sonarr/SystemStatus.cs +++ b/PlexRequests.Api.Models/Sonarr/SystemStatus.cs @@ -37,12 +37,15 @@ namespace PlexRequests.Api.Models.Sonarr public string startupPath { get; set; } public string appData { get; set; } public string osVersion { get; set; } + public bool isMonoRuntime { get; set; } public bool isMono { get; set; } public bool isLinux { get; set; } + public bool isOsx { get; set; } public bool isWindows { get; set; } public string branch { get; set; } - public bool authentication { get; set; } - public int startOfWeek { get; set; } + public string authentication { get; set; } + public string sqliteVersion { get; set; } public string urlBase { get; set; } + public string runtimeVersion { get; set; } } } \ No newline at end of file diff --git a/PlexRequests.Api/ApiRequest.cs b/PlexRequests.Api/ApiRequest.cs index f90aec7cf..f1a2c11d0 100644 --- a/PlexRequests.Api/ApiRequest.cs +++ b/PlexRequests.Api/ApiRequest.cs @@ -95,10 +95,17 @@ namespace PlexRequests.Api throw new ApplicationException(message, response.ErrorException); } - var json = JsonConvert.DeserializeObject(response.Content); - - return json; + try + { + var json = JsonConvert.DeserializeObject(response.Content); + return json; + } + catch (Exception e) + { + Log.Fatal(e); + throw; + } } public T DeserializeXml(string input) diff --git a/PlexRequests.Core/StatusChecker.cs b/PlexRequests.Core/StatusChecker.cs index 1512082f0..52b135312 100644 --- a/PlexRequests.Core/StatusChecker.cs +++ b/PlexRequests.Core/StatusChecker.cs @@ -55,7 +55,7 @@ namespace PlexRequests.Core public StatusModel GetStatus() { - var assemblyVersion = AssemblyHelper.GetAssemblyVersion(); + var assemblyVersion = AssemblyHelper.GetProductVersion(); var model = new StatusModel { Version = assemblyVersion, @@ -66,7 +66,7 @@ namespace PlexRequests.Core var latestVersionArray = latestRelease.Result.Name.Split(new[] { 'v' }, StringSplitOptions.RemoveEmptyEntries); var latestVersion = latestVersionArray.Length > 1 ? latestVersionArray[1] : string.Empty; - if (!latestVersion.Equals(AssemblyHelper.GetProductVersion(), StringComparison.InvariantCultureIgnoreCase)) + if (!latestVersion.Equals(assemblyVersion, StringComparison.InvariantCultureIgnoreCase)) { model.UpdateAvailable = true; model.UpdateUri = latestRelease.Result.HtmlUrl; diff --git a/PlexRequests.UI/Content/requests.js b/PlexRequests.UI/Content/requests.js index 756283b3b..8c83f3328 100644 --- a/PlexRequests.UI/Content/requests.js +++ b/PlexRequests.UI/Content/requests.js @@ -136,7 +136,7 @@ $('#noteModal').on('show.bs.modal', function (event) { var modal = $(this); modal.find('.theNoteSaveButton').val(id); // Add ID to the button - var requestField = modal.find('input'); + var requestField = modal.find('.noteId'); requestField.val(id); // Add ID to the hidden field }); diff --git a/PlexRequests.UI/Modules/ApplicationTesterModule.cs b/PlexRequests.UI/Modules/ApplicationTesterModule.cs index 40d118f9e..2e6c719ad 100644 --- a/PlexRequests.UI/Modules/ApplicationTesterModule.cs +++ b/PlexRequests.UI/Modules/ApplicationTesterModule.cs @@ -118,7 +118,7 @@ namespace PlexRequests.UI.Modules var settings = AuthSettings.GetSettings(); if (settings?.PlexAuthToken == null) { - return Response.AsJson(new JsonResponseModel { Result = false, Message = "Plex is not setup yet, we need " }); + return Response.AsJson(new JsonResponseModel { Result = false, Message = "Plex is not setup yet, you need to update your Authentication settings" }); } try { diff --git a/PlexRequests.UI/Modules/LoginModule.cs b/PlexRequests.UI/Modules/LoginModule.cs index a983377c6..d24bf19bf 100644 --- a/PlexRequests.UI/Modules/LoginModule.cs +++ b/PlexRequests.UI/Modules/LoginModule.cs @@ -86,12 +86,14 @@ namespace PlexRequests.UI.Modules Post["/register"] = x => { + var username = (string) Request.Form.Username; var exists = UserMapper.DoUsersExist(); if (exists) { - return Context.GetRedirect("~/register?error=true&username=" + (string)Request.Form.Username); + return Context.GetRedirect("~/register?error=true&username=" + username); } - var userId = UserMapper.CreateUser(Request.Form.Username, Request.Form.Password); + var userId = UserMapper.CreateUser(username, Request.Form.Password); + Session[SessionKeys.UsernameKey] = username; return this.LoginAndRedirect((Guid)userId); }; } diff --git a/PlexRequests.UI/Modules/RequestsModule.cs b/PlexRequests.UI/Modules/RequestsModule.cs index 239b98e4a..68c997560 100644 --- a/PlexRequests.UI/Modules/RequestsModule.cs +++ b/PlexRequests.UI/Modules/RequestsModule.cs @@ -61,7 +61,7 @@ namespace PlexRequests.UI.Modules Post["/clearissues"] = _ => ClearIssue((int)Request.Form.Id); Post["/changeavailability"] = _ => ChangeRequestAvailability((int)Request.Form.Id, (bool)Request.Form.Available); - Post["/addnote"] = _ => AddNote((int)Request.Form.Id, (string)Request.Form.noteArea); + Post["/addnote"] = _ => AddNote((int)Request.Form.requestId, (string)Request.Form.noteArea); } private IRepository Service { get; } @@ -213,7 +213,7 @@ namespace PlexRequests.UI.Modules var originalRequest = Service.Get(requestId); if (originalRequest == null) { - return Response.AsJson(new JsonResponseModel { Result = false, Message = "Request does not exist to change the availability!" }); + return Response.AsJson(new JsonResponseModel { Result = false, Message = "Request does not exist to add a note!" }); } originalRequest.AdminNote = noteArea; diff --git a/PlexRequests.UI/Program.cs b/PlexRequests.UI/Program.cs index b85c99c73..b3c66e329 100644 --- a/PlexRequests.UI/Program.cs +++ b/PlexRequests.UI/Program.cs @@ -62,7 +62,7 @@ namespace PlexRequests.UI uri = $"http://localhost:{portResult}"; } - Log.Trace("Getting assembly version"); + Log.Trace("Getting product version"); WriteOutVersion(); var s = new Setup(); @@ -81,7 +81,7 @@ namespace PlexRequests.UI private static void WriteOutVersion() { - var assemblyVer = AssemblyHelper.GetAssemblyVersion(); + var assemblyVer = AssemblyHelper.GetProductVersion(); Log.Info($"Version: {assemblyVer}"); Console.WriteLine($"Version: {assemblyVer}"); } diff --git a/PlexRequests.UI/Views/Admin/_Sidebar.cshtml b/PlexRequests.UI/Views/Admin/_Sidebar.cshtml index b2e3da3c2..88726ee09 100644 --- a/PlexRequests.UI/Views/Admin/_Sidebar.cshtml +++ b/PlexRequests.UI/Views/Admin/_Sidebar.cshtml @@ -2,11 +2,11 @@
@if (Context.Request.Path == "/admin") { - Plex Request Settings + Plex Request } else { - Plex Request Settings + Plex Request } @if (Context.Request.Path == "/admin/authentication") { @@ -21,28 +21,28 @@ @if (Context.Request.Path == "/admin/plex") { - Plex Settings + Plex } else { - Plex Settings + Plex } @if (Context.Request.Path == "/admin/couchpotato") { - CouchPotato Settings + CouchPotato } else { - CouchPotato Settings + CouchPotato } @if (Context.Request.Path == "/admin/sonarr") { - Sonarr Settings + Sonarr } else { - Sonarr Settings + Sonarr } @*Sickbeard Settings*@ diff --git a/PlexRequests.UI/Views/Requests/Index.cshtml b/PlexRequests.UI/Views/Requests/Index.cshtml index 6aeadfb7f..7de26fd08 100644 --- a/PlexRequests.UI/Views/Requests/Index.cshtml +++ b/PlexRequests.UI/Views/Requests/Index.cshtml @@ -150,14 +150,14 @@
  • Wrong Content
  • Playback Issues
  • Other
    • + {{#if_eq admin true}} +
  • Add Note
    • + + {{/if_eq}}
    - {{#if_eq admin true}} - - - {{/if_eq}} @* // TODO add Issues to the view *@ @@ -195,7 +195,7 @@
    - +