mirror
/
Lidarr
mirror of https://github.com/lidarr/Lidarr
1
0
Fork 0
Code Issues Releases Wiki Activity

Fixed: Wanted Page Count in UI and Paging, Sort by Album Title

This commit is contained in:
Qstick 2018-03-24 22:20:13 -04:00
parent df4e1e9b26
commit a96df79572
2 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
frontend/src/Store/Actions/wantedActions.js
View File

@ -41,6 +41,7 @@ export const defaultState = {
{ {
name: 'albumTitle', name: 'albumTitle',
label: 'Album Title', label: 'Album Title',
isSortable: true,
isVisible: true isVisible: true
}, },
{ {
@ -119,6 +120,7 @@ export const defaultState = {
{ {
name: 'albumTitle', name: 'albumTitle',
label: 'Album Title', label: 'Album Title',
isSortable: true,
isVisible: true isVisible: true
}, },
{ {

12
src/NzbDrone.Core/Music/AlbumRepository.cs
View File

@ -119,6 +119,10 @@ namespace NzbDrone.Core.Music
{ {
sortKey = "Artists." + pagingSpec.SortKey.Split('.').Last(); sortKey = "Artists." + pagingSpec.SortKey.Split('.').Last();
} }
else if (pagingSpec.SortKey == "albumTitle")
{
sortKey = "Albums.title";
}
else else
{ {
sortKey = "Albums.releaseDate"; sortKey = "Albums.releaseDate";
@ -138,11 +142,11 @@ namespace NzbDrone.Core.Music
private int GetMissingAlbumsQueryCount(PagingSpec<Album> pagingSpec, DateTime currentTime) private int GetMissingAlbumsQueryCount(PagingSpec<Album> pagingSpec, DateTime currentTime)
{ {
var monitored = 0; var monitored = "(Albums.[Monitored] = 0) OR (Artists.[Monitored] = 0)";
if (pagingSpec.FilterExpressions.FirstOrDefault().ToString().Contains("True")) if (pagingSpec.FilterExpressions.FirstOrDefault().ToString().Contains("True"))
{ {
monitored = 1; monitored = "(Albums.[Monitored] = 1) AND (Artists.[Monitored] = 1)";
} }
string query = string.Format("SELECT Albums.* FROM (SELECT Tracks.AlbumId, COUNT(*) AS TotalTrackCount," + string query = string.Format("SELECT Albums.* FROM (SELECT Tracks.AlbumId, COUNT(*) AS TotalTrackCount," +
@ -180,6 +184,10 @@ namespace NzbDrone.Core.Music
{ {
sortKey = "Artists." + pagingSpec.SortKey.Split('.').Last(); sortKey = "Artists." + pagingSpec.SortKey.Split('.').Last();
} }
else if (pagingSpec.SortKey == "albumTitle")
{
sortKey = "Albums.title";
}
else else
{ {
sortKey = "Albums.releaseDate"; sortKey = "Albums.releaseDate";