diff --git a/NzbDrone.Common/NzbDrone.Common.csproj b/NzbDrone.Common/NzbDrone.Common.csproj index 5f399945f..315f7450c 100644 --- a/NzbDrone.Common/NzbDrone.Common.csproj +++ b/NzbDrone.Common/NzbDrone.Common.csproj @@ -103,6 +103,7 @@ + @@ -120,7 +121,6 @@ - diff --git a/NzbDrone.Common/IJsonSerializer.cs b/NzbDrone.Common/Serializer/JsonSerializer.cs similarity index 100% rename from NzbDrone.Common/IJsonSerializer.cs rename to NzbDrone.Common/Serializer/JsonSerializer.cs diff --git a/UI/Series/Details/SeasonLayout.js b/UI/Series/Details/SeasonLayout.js index f71d1780c..f6bee513c 100644 --- a/UI/Series/Details/SeasonLayout.js +++ b/UI/Series/Details/SeasonLayout.js @@ -25,7 +25,7 @@ define(['app'], function () { name : 'airDate', label : 'Air Date', editable : false, - cell : 'datetime' + cell : 'date' //formatter: new Backgrid.AirDateFormatter() } ], diff --git a/UI/Series/SeasonCollection.js b/UI/Series/SeasonCollection.js index 3886d09f0..8202f34f3 100644 --- a/UI/Series/SeasonCollection.js +++ b/UI/Series/SeasonCollection.js @@ -1,7 +1,20 @@ "use strict"; define(['app', 'Series/SeasonModel'], function () { - NzbDrone.Series.SeasonCollection = Backbone.Collection.extend({ + NzbDrone.Series.SeasonCollection = Backbone.PageableCollection.extend({ url : NzbDrone.Constants.ApiRoot + '/season', - model: NzbDrone.Series.SeasonModel + model: NzbDrone.Series.SeasonModel, + + mode: 'client', + + state: { + sortKey : 'seasonNumber', + order : 1, + pageSize: 1000000 + }, + + queryParams: { + sortKey: null, + order : null + } }); });