github/Ombi
1
0
Fork 0
mirror of https://github.com/Ombi-app/Ombi.git synced 2025-08-20 21:33:15 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixed an issue with the test buttons on the *arr components not working correctly

Browse source
This commit is contained in:
tidusjar 2021-02-17 08:21:47 +00:00
commit f94f4ac1c0
4 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/Ombi/ClientApp/src/app/settings/lidarr/lidarr.component.ts
View file

@ -109,7 +109,7 @@ export class LidarrComponent implements OnInit {
this.testerService.lidarrTest(settings).subscribe(result => { this.testerService.lidarrTest(settings).subscribe(result => {
if (result.isValid) { if (result.isValid) {
this.notificationService.success("Successfully connected to Lidarr!"); this.notificationService.success("Successfully connected to Lidarr!");
} else if (result.expectedSubDir !== null) { } else if (result.expectedSubDir) {
this.notificationService.error("Your Lidarr Base URL must be set to " + result.expectedSubDir); this.notificationService.error("Your Lidarr Base URL must be set to " + result.expectedSubDir);
} else { } else {
this.notificationService.error("We could not connect to Lidarr!"); this.notificationService.error("We could not connect to Lidarr!");

2
src/Ombi/ClientApp/src/app/settings/radarr/radarr.component.ts
View file

@ -99,7 +99,7 @@ export class RadarrComponent implements OnInit {
this.testerService.radarrTest(settings).subscribe(result => { this.testerService.radarrTest(settings).subscribe(result => {
if (result.isValid) { if (result.isValid) {
this.notificationService.success("Successfully connected to Radarr!"); this.notificationService.success("Successfully connected to Radarr!");
} else if (result.expectedSubDir !== null) { } else if (result.expectedSubDir) {
this.notificationService.error("Your Radarr Base URL must be set to " + result.expectedSubDir); this.notificationService.error("Your Radarr Base URL must be set to " + result.expectedSubDir);
} else { } else {
this.notificationService.error("We could not connect to Radarr!"); this.notificationService.error("We could not connect to Radarr!");

2
src/Ombi/ClientApp/src/app/settings/sonarr/sonarr.component.ts
View file

@ -153,7 +153,7 @@ export class SonarrComponent implements OnInit {
this.testerService.sonarrTest(settings).subscribe(result => { this.testerService.sonarrTest(settings).subscribe(result => {
if (result.isValid) { if (result.isValid) {
this.notificationService.success("Successfully connected to Sonarr!"); this.notificationService.success("Successfully connected to Sonarr!");
} else if (result.expectedSubDir !== null) { } else if (result.expectedSubDir) {
this.notificationService.error("Your Sonarr Base URL must be set to " + result.expectedSubDir); this.notificationService.error("Your Sonarr Base URL must be set to " + result.expectedSubDir);
} else { } else {
this.notificationService.error("We could not connect to Sonarr!"); this.notificationService.error("We could not connect to Sonarr!");

6
src/Ombi/Controllers/V1/External/TesterController.cs vendored
View file

@ -374,7 +374,7 @@ namespace Ombi.Controllers.V1.External
var result = await RadarrApi.SystemStatus(settings.ApiKey, settings.FullUri); var result = await RadarrApi.SystemStatus(settings.ApiKey, settings.FullUri);
return new TesterResultModel return new TesterResultModel
{ {
IsValid = result.urlBase == settings.SubDir, IsValid = result.urlBase == settings.SubDir || string.IsNullOrEmpty(result.urlBase) && string.IsNullOrEmpty(settings.SubDir),
ExpectedSubDir = result.urlBase ExpectedSubDir = result.urlBase
}; };
} }
@ -399,7 +399,7 @@ namespace Ombi.Controllers.V1.External
var result = await SonarrApi.SystemStatus(settings.ApiKey, settings.FullUri); var result = await SonarrApi.SystemStatus(settings.ApiKey, settings.FullUri);
return new TesterResultModel return new TesterResultModel
{ {
IsValid = result.urlBase == settings.SubDir, IsValid = result.urlBase == settings.SubDir || string.IsNullOrEmpty(result.urlBase) && string.IsNullOrEmpty(settings.SubDir),
ExpectedSubDir = result.urlBase ExpectedSubDir = result.urlBase
}; };
} }
@ -513,7 +513,7 @@ namespace Ombi.Controllers.V1.External
var status = await LidarrApi.Status(settings.ApiKey, settings.FullUri); var status = await LidarrApi.Status(settings.ApiKey, settings.FullUri);
return new TesterResultModel return new TesterResultModel
{ {
IsValid = status?.urlBase == settings.SubDir, IsValid = status?.urlBase == settings.SubDir || string.IsNullOrEmpty(result.urlBase) && string.IsNullOrEmpty(settings.SubDir),
ExpectedSubDir = status?.urlBase ExpectedSubDir = status?.urlBase
}; };
} }