tedkulp/Sonarr
1
0
Fork 0
mirror of https://github.com/Sonarr/Sonarr.git synced 2026-04-26 22:56:23 -04:00
Code Issues Projects Releases Wiki Activity

Merge branch 'series-sorttitle' of https://github.com/Taloth/NzbDrone into develop

Browse Source 
Conflicts:
	src/NzbDrone.Api/Series/SeriesResource.cs
	src/NzbDrone.Core/Tv/SeriesService.cs
This commit is contained in:
Mark McDowall
2014-07-02 07:42:04 -07:00
parent 7df5d6c9b8 c2b06d957d
commit bd0392a376
24 changed files with 301 additions and 154 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/UI/Series/Editor/SeriesEditorLayout.js
+14 -13
View File
@@ -57,25 +57,26 @@ define(
cell : SeriesStatusCell
},
{
name : 'title',
label : 'Title',
cell : SeriesTitleCell,
cellValue: 'this'
name : 'title',
label : 'Title',
cell : SeriesTitleCell,
cellValue : 'this',
sortValue : 'sortTitle'
},
{
name : 'qualityProfileId',
label: 'Quality',
cell : QualityProfileCell
name : 'qualityProfileId',
label : 'Quality',
cell : QualityProfileCell
},
{
name : 'seasonFolder',
label: 'Season Folder',
cell : SeasonFolderCell
name : 'seasonFolder',
label : 'Season Folder',
cell : SeasonFolderCell
},
{
name : 'path',
label: 'Path',
cell : 'string'
name : 'path',
label : 'Path',
cell : 'string'
}
],
src/UI/Series/Index/SeriesIndexLayout.js
+22 -21
View File
@@ -53,25 +53,26 @@ define(
cell : SeriesStatusCell
},
{
name : 'title',
label : 'Title',
cell : SeriesTitleCell,
cellValue: 'this'
name : 'title',
label : 'Title',
cell : SeriesTitleCell,
cellValue : 'this',
sortValue : 'sortTitle'
},
{
name : 'seasonCount',
label: 'Seasons',
cell : 'integer'
name : 'seasonCount',
label : 'Seasons',
cell : 'integer'
},
{
name : 'qualityProfileId',
label: 'Quality',
cell : QualityProfileCell
name : 'qualityProfileId',
label : 'Quality',
cell : QualityProfileCell
},
{
name : 'network',
label: 'Network',
cell : 'string'
name : 'network',
label : 'Network',
cell : 'string'
},
{
name : 'nextAiring',
@@ -80,16 +81,16 @@ define(
sortValue : SeriesCollection.nextAiring
},
{
name : 'percentOfEpisodes',
label : 'Episodes',
cell : EpisodeProgressCell,
className: 'episode-progress-cell'
name : 'percentOfEpisodes',
label : 'Episodes',
cell : EpisodeProgressCell,
className : 'episode-progress-cell'
},
{
name : 'this',
label : '',
sortable: false,
cell : SeriesActionsCell
name : 'this',
label : '',
sortable : false,
cell : SeriesActionsCell
}
],
src/UI/Series/SeriesCollection.js
+10 -4
View File
@@ -59,12 +59,18 @@ define(
//Sorters
nextAiring: function (model, attr) {
var nextAiring = model.get(attr);
if (!nextAiring) {
return Number.MAX_VALUE;
if (nextAiring) {
return Moment(nextAiring).unix();
}
var previousAiring = model.get(attr.replace('nextAiring', 'previousAiring'));
if (previousAiring) {
return 10000000000 - Moment(previousAiring).unix();
}
return Moment(nextAiring).unix();
return Number.MAX_VALUE;
}
});