github/lidarr
1
0
Fork 0
mirror of https://github.com/lidarr/lidarr.git synced 2025-08-19 13:10:13 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Fixed: Album API query by foreignId only returns requested album

Browse source 
Setting the new 'includeAllArtistAlbums' will give the existing
behaviour of returning all albums for that artist
This commit is contained in:
ta264 2019-04-11 07:38:05 +01:00
commit 7b288bfcd3
2 changed files with 16 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

5
frontend/src/Album/Details/AlbumDetailsPageConnector.js
View file

@ -55,7 +55,10 @@ class AlbumDetailsPageConnector extends Component {
populate = () => { populate = () => {
const foreignAlbumId = this.props.foreignAlbumId; const foreignAlbumId = this.props.foreignAlbumId;
this.setState({ hasMounted: true }); this.setState({ hasMounted: true });
this.props.fetchAlbums({ foreignAlbumId }); this.props.fetchAlbums({
foreignAlbumId,
includeAllArtistAlbums: true
});
} }
unpopulate = () => { unpopulate = () => {

14
src/Lidarr.Api.V1/Albums/AlbumModule.cs
View file

@ -42,6 +42,7 @@ namespace Lidarr.Api.V1.Albums
var artistIdQuery = Request.Query.ArtistId; var artistIdQuery = Request.Query.ArtistId;
var albumIdsQuery = Request.Query.AlbumIds; var albumIdsQuery = Request.Query.AlbumIds;
var foreignIdQuery = Request.Query.ForeignAlbumId; var foreignIdQuery = Request.Query.ForeignAlbumId;
var includeAllArtistAlbumsQuery = Request.Query.IncludeAllArtistAlbums;
if (!Request.Query.ArtistId.HasValue && !albumIdsQuery.HasValue && !foreignIdQuery.HasValue) if (!Request.Query.ArtistId.HasValue && !albumIdsQuery.HasValue && !foreignIdQuery.HasValue)
{ {
@ -57,9 +58,18 @@ namespace Lidarr.Api.V1.Albums
if (foreignIdQuery.HasValue) if (foreignIdQuery.HasValue)
{ {
int artistId = _albumService.FindById(foreignIdQuery.Value).ArtistId; string foreignAlbumId = foreignIdQuery.Value.ToString();
return MapToResource(_albumService.GetAlbumsByArtist(artistId), false); var album = _albumService.FindById(foreignAlbumId);
if (includeAllArtistAlbumsQuery.HasValue && Convert.ToBoolean(includeAllArtistAlbumsQuery.Value))
{
return MapToResource(_albumService.GetAlbumsByArtist(album.ArtistId), false);
}
else
{
return MapToResource(new List<Album> { album }, false);
}
} }
string albumIdsValue = albumIdsQuery.Value.ToString(); string albumIdsValue = albumIdsQuery.Value.ToString();