open-source-mirrors
/
Lidarr
mirror of https://github.com/Lidarr/Lidarr
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed: Sorting on Series Title now ignores articles (a/an/the).

Browse Source
pull/4/head
Taloth Saldono 11 years ago
parent fd5e8a5166
commit 221a457f3a
11 changed files with 166 additions and 149 deletions
Show Stats Download Patch File Download Diff File

2
src/NzbDrone.Api/Blacklist/BlacklistModule.cs
Unescape View File

@ -28,7 +28,7 @@ namespace NzbDrone.Api.Blacklist
//This is a hack to deal with backgrid setting the sortKey to the column name instead of sortValue //This is a hack to deal with backgrid setting the sortKey to the column name instead of sortValue
if (pagingSpec.SortKey.Equals("series", StringComparison.InvariantCultureIgnoreCase)) if (pagingSpec.SortKey.Equals("series", StringComparison.InvariantCultureIgnoreCase))
{ {
pagingSpec.SortKey = "series.title"; pagingSpec.SortKey = "series.sortTitle";
} }
return ApplyToPage(_blacklistService.Paged, pagingSpec); return ApplyToPage(_blacklistService.Paged, pagingSpec);

2
src/NzbDrone.Api/History/HistoryModule.cs
Unescape View File

@ -36,7 +36,7 @@ namespace NzbDrone.Api.History
//This is a hack to deal with backgrid setting the sortKey to the column name instead of sortValue //This is a hack to deal with backgrid setting the sortKey to the column name instead of sortValue
if (pagingSpec.SortKey.Equals("series", StringComparison.InvariantCultureIgnoreCase)) if (pagingSpec.SortKey.Equals("series", StringComparison.InvariantCultureIgnoreCase))
{ {
pagingSpec.SortKey = "series.title"; pagingSpec.SortKey = "series.sortTitle";
} }
if (pagingResource.FilterKey == "eventType") if (pagingResource.FilterKey == "eventType")

9
src/NzbDrone.Api/Wanted/CutoffModule.cs
Unescape View File

@ -1,4 +1,5 @@
using System.Linq; using System;
using System.Linq;
using NzbDrone.Api.Episodes; using NzbDrone.Api.Episodes;
using NzbDrone.Api.Extensions; using NzbDrone.Api.Extensions;
using NzbDrone.Core.Datastore; using NzbDrone.Core.Datastore;
@ -30,6 +31,12 @@ namespace NzbDrone.Api.Wanted
SortDirection = pagingResource.SortDirection SortDirection = pagingResource.SortDirection
}; };
//This is a hack to deal with backgrid setting the sortKey to the column name instead of sortValue
if (pagingSpec.SortKey.Equals("series", StringComparison.InvariantCultureIgnoreCase))
{
pagingSpec.SortKey = "series.sortTitle";
}
if (pagingResource.FilterKey == "monitored" && pagingResource.FilterValue == "false") if (pagingResource.FilterKey == "monitored" && pagingResource.FilterValue == "false")
{ {
pagingSpec.FilterExpression = v => v.Monitored == false || v.Series.Monitored == false; pagingSpec.FilterExpression = v => v.Monitored == false || v.Series.Monitored == false;

9
src/NzbDrone.Api/Wanted/MissingModule.cs
Unescape View File

@ -1,4 +1,5 @@
using System.Linq; using System;
using System.Linq;
using NzbDrone.Api.Episodes; using NzbDrone.Api.Episodes;
using NzbDrone.Api.Extensions; using NzbDrone.Api.Extensions;
using NzbDrone.Core.Datastore; using NzbDrone.Core.Datastore;
@ -30,6 +31,12 @@ namespace NzbDrone.Api.Wanted
SortDirection = pagingResource.SortDirection SortDirection = pagingResource.SortDirection
}; };
//This is a hack to deal with backgrid setting the sortKey to the column name instead of sortValue
if (pagingSpec.SortKey.Equals("series", StringComparison.InvariantCultureIgnoreCase))
{
pagingSpec.SortKey = "series.sortTitle";
}
if (pagingResource.FilterKey == "monitored" && pagingResource.FilterValue == "false") if (pagingResource.FilterKey == "monitored" && pagingResource.FilterValue == "false")
{ {
pagingSpec.FilterExpression = v => v.Monitored == false || v.Series.Monitored == false; pagingSpec.FilterExpression = v => v.Monitored == false || v.Series.Monitored == false;

2
src/UI/History/Blacklist/BlacklistLayout.js
Unescape View File

@ -38,7 +38,7 @@ define(
name : 'series', name : 'series',
label : 'Series', label : 'Series',
cell : SeriesTitleCell, cell : SeriesTitleCell,
sortValue: 'series.title' sortValue : 'series.sortTitle'
}, },
{ {
name : 'sourceTitle', name : 'sourceTitle',

11
src/UI/History/Queue/QueueLayout.js
Unescape View File

@ -40,19 +40,20 @@ define(
{ {
name : 'series', name : 'series',
label : 'Series', label : 'Series',
cell : SeriesTitleCell cell : SeriesTitleCell,
sortable : false
}, },
{ {
name : 'episode', name : 'episode',
label : 'Episode', label : 'Episode',
sortable: false, cell : EpisodeNumberCell,
cell : EpisodeNumberCell sortable : false
}, },
{ {
name : 'episode', name : 'episode',
label : 'Episode Title', label : 'Episode Title',
sortable: false, cell : EpisodeTitleCell,
cell : EpisodeTitleCell sortable : false
}, },
{ {
name : 'quality', name : 'quality',

10
src/UI/History/Table/HistoryTableLayout.js
Unescape View File

@ -48,19 +48,19 @@ define(
name : 'series', name : 'series',
label : 'Series', label : 'Series',
cell : SeriesTitleCell, cell : SeriesTitleCell,
sortValue: 'series.title' sortValue : 'series.sortTitle'
}, },
{ {
name : 'episode', name : 'episode',
label : 'Episode', label : 'Episode',
sortable: false, cell : EpisodeNumberCell,
cell : EpisodeNumberCell sortable : false
}, },
{ {
name : 'episode', name : 'episode',
label : 'Episode Title', label : 'Episode Title',
sortable: false, cell : EpisodeTitleCell,
cell : EpisodeTitleCell sortable : false
}, },
{ {
name : 'quality', name : 'quality',

3
src/UI/Series/Editor/SeriesEditorLayout.js
Unescape View File

@ -60,7 +60,8 @@ define(
name : 'title', name : 'title',
label : 'Title', label : 'Title',
cell : SeriesTitleCell, cell : SeriesTitleCell,
cellValue: 'this' cellValue : 'this',
sortValue : 'sortTitle'
}, },
{ {
name : 'qualityProfileId', name : 'qualityProfileId',

3
src/UI/Series/Index/SeriesIndexLayout.js
Unescape View File

@ -56,7 +56,8 @@ define(
name : 'title', name : 'title',
label : 'Title', label : 'Title',
cell : SeriesTitleCell, cell : SeriesTitleCell,
cellValue: 'this' cellValue : 'this',
sortValue : 'sortTitle'
}, },
{ {
name : 'seasonCount', name : 'seasonCount',

12
src/UI/Wanted/Cutoff/CutoffUnmetLayout.js
Unescape View File

@ -53,20 +53,20 @@ define([
{ {
name : 'series', name : 'series',
label : 'Series Title', label : 'Series Title',
sortable : false, cell : SeriesTitleCell,
cell : SeriesTitleCell sortValue : 'series.sortTitle'
}, },
{ {
name : 'this', name : 'this',
label : 'Episode', label : 'Episode',
sortable : false, cell : EpisodeNumberCell,
cell : EpisodeNumberCell sortable : false
}, },
{ {
name : 'this', name : 'this',
label : 'Episode Title', label : 'Episode Title',
sortable : false, cell : EpisodeTitleCell,
cell : EpisodeTitleCell sortable : false
}, },
{ {
name : 'airDateUtc', name : 'airDateUtc',

12
src/UI/Wanted/Missing/MissingLayout.js
Unescape View File

@ -53,20 +53,20 @@ define([
{ {
name : 'series', name : 'series',
label : 'Series Title', label : 'Series Title',
sortable : false, cell : SeriesTitleCell,
cell : SeriesTitleCell sortValue : 'series.sortTitle'
}, },
{ {
name : 'this', name : 'this',
label : 'Episode', label : 'Episode',
sortable : false, cell : EpisodeNumberCell,
cell : EpisodeNumberCell sortable : false
}, },
{ {
name : 'this', name : 'this',
label : 'Episode Title', label : 'Episode Title',
sortable : false, cell : EpisodeTitleCell,
cell : EpisodeTitleCell sortable : false
}, },
{ {
name : 'airDateUtc', name : 'airDateUtc',

Write Preview
Loading…
Cancel
Save