From 948097cd6c5f990d4a3bb0f7cac849b33ccc0b6a Mon Sep 17 00:00:00 2001 From: tidusjar Date: Wed, 25 Jan 2017 20:57:55 +0000 Subject: [PATCH 1/4] Fixed #991 --- Ombi.UI/Views/Admin/Sonarr.cshtml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Ombi.UI/Views/Admin/Sonarr.cshtml b/Ombi.UI/Views/Admin/Sonarr.cshtml index 025059e94..8c6405f5d 100644 --- a/Ombi.UI/Views/Admin/Sonarr.cshtml +++ b/Ombi.UI/Views/Admin/Sonarr.cshtml @@ -182,7 +182,7 @@ console.log('Hit root folders..'); - var rootFolderSelected = @Model.RootPath; + var rootFolderSelected = '@Model.RootPath'; if (!rootFolderSelected) { return; } From 2d1ad10b704fdc362f03e4e12124a8266f7c1fec Mon Sep 17 00:00:00 2001 From: tidusjar Date: Wed, 25 Jan 2017 21:22:28 +0000 Subject: [PATCH 2/4] Fix for #978 --- Ombi.Api/RadarrApi.cs | 5 +++++ Ombi.Core/MovieSender.cs | 2 +- Ombi.Core/MovieSenderResult.cs | 2 ++ Ombi.UI/Modules/SearchModule.cs | 12 +++++++++++- 4 files changed, 19 insertions(+), 2 deletions(-) diff --git a/Ombi.Api/RadarrApi.cs b/Ombi.Api/RadarrApi.cs index af01f6e40..7eeb98d3f 100644 --- a/Ombi.Api/RadarrApi.cs +++ b/Ombi.Api/RadarrApi.cs @@ -107,6 +107,11 @@ namespace Ombi.Api var error = JsonConvert.DeserializeObject < RadarrError>(response.Content); return new RadarrAddMovie {Error = error}; } + if (response.Content.Contains("\"errorMessage\":")) + { + var error = JsonConvert.DeserializeObject>(response.Content).FirstOrDefault(); + return new RadarrAddMovie {Error = new RadarrError {message = error?.errorMessage}}; + } return JsonConvert.DeserializeObject < RadarrAddMovie>(response.Content); } catch (JsonSerializationException jse) diff --git a/Ombi.Core/MovieSender.cs b/Ombi.Core/MovieSender.cs index 97d45fcd5..37eeee308 100644 --- a/Ombi.Core/MovieSender.cs +++ b/Ombi.Core/MovieSender.cs @@ -111,7 +111,7 @@ namespace Ombi.Core if (!string.IsNullOrEmpty(result.Error?.message)) { Log.Error(result.Error.message); - return new MovieSenderResult { Result = false }; + return new MovieSenderResult { Result = false, Error = true}; } if (!string.IsNullOrEmpty(result.title)) { diff --git a/Ombi.Core/MovieSenderResult.cs b/Ombi.Core/MovieSenderResult.cs index ccf96ebb9..6ec6ea556 100644 --- a/Ombi.Core/MovieSenderResult.cs +++ b/Ombi.Core/MovieSenderResult.cs @@ -36,5 +36,7 @@ namespace Ombi.Core /// true if [movie sending enabled]; otherwise, false. /// public bool MovieSendingEnabled { get; set; } + + public bool Error { get; set; } } } \ No newline at end of file diff --git a/Ombi.UI/Modules/SearchModule.cs b/Ombi.UI/Modules/SearchModule.cs index 75c6352e4..fb95ea1e0 100644 --- a/Ombi.UI/Modules/SearchModule.cs +++ b/Ombi.UI/Modules/SearchModule.cs @@ -789,7 +789,17 @@ namespace Ombi.UI.Modules if (result.Result) { return await AddRequest(model, settings, - $"{fullMovieName} {Resources.UI.Search_SuccessfullyAdded}"); + $"{fullMovieName} {Resources.UI.Search_SuccessfullyAdded}"); + } + if (result.Error) + + { + return + Response.AsJson(new JsonResponseModel + { + Message = "Could not add movie, please contract your administrator", + Result = false + }); } if (!result.MovieSendingEnabled) { From d5e797567aecdffcb8cc8749fc03fd85b03725da Mon Sep 17 00:00:00 2001 From: tidusjar Date: Wed, 25 Jan 2017 21:40:52 +0000 Subject: [PATCH 3/4] fixed #995 --- Ombi.UI/Modules/RequestsModule.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Ombi.UI/Modules/RequestsModule.cs b/Ombi.UI/Modules/RequestsModule.cs index 72fbba0f9..337389bd0 100644 --- a/Ombi.UI/Modules/RequestsModule.cs +++ b/Ombi.UI/Modules/RequestsModule.cs @@ -275,7 +275,7 @@ namespace Ombi.UI.Modules Episodes = tv.Episodes.ToArray(), RootFolders = rootFolders.ToArray(), HasRootFolders = rootFolders.Any(), - CurrentRootPath = GetRootPath(tv.RootFolderSelected, sonarrSettings).Result + CurrentRootPath = sonarrSettings.Enabled ? GetRootPath(tv.RootFolderSelected, sonarrSettings).Result : null }).ToList(); return Response.AsJson(viewModel); From b535b4a8dcbd01e45f8b860cf72a531d8ee968ae Mon Sep 17 00:00:00 2001 From: tidusjar Date: Wed, 25 Jan 2017 21:51:28 +0000 Subject: [PATCH 4/4] small changes --- Ombi.UI/Modules/RequestsModule.cs | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Ombi.UI/Modules/RequestsModule.cs b/Ombi.UI/Modules/RequestsModule.cs index 337389bd0..699b19b67 100644 --- a/Ombi.UI/Modules/RequestsModule.cs +++ b/Ombi.UI/Modules/RequestsModule.cs @@ -292,7 +292,9 @@ namespace Ombi.UI.Modules { return r.path; } - return string.Empty; + + // Return default path + return rootFoldersResult.FirstOrDefault(x => x.id.Equals(int.Parse(sonarrSettings.RootPath)))?.path ?? string.Empty; } private async Task GetAlbumRequests()