Missing doesn't double fetch

This commit is contained in:
Mark McDowall 2013-05-02 17:25:51 -07:00
parent 9823560ec0
commit 6a3d886588
7 changed files with 12 additions and 18 deletions

View File

@ -49,7 +49,10 @@ namespace NzbDrone.Core.Datastore
.HasOne(s => s.QualityProfile, s => s.QualityProfileId); .HasOne(s => s.QualityProfile, s => s.QualityProfileId);
Mapper.Entity<Season>().RegisterModel("Seasons"); Mapper.Entity<Season>().RegisterModel("Seasons");
Mapper.Entity<Episode>().RegisterModel("Episodes");
Mapper.Entity<Episode>().RegisterModel("Episodes")
.Ignore(e => e.SeriesTitle);
Mapper.Entity<EpisodeFile>().RegisterModel("EpisodeFiles"); Mapper.Entity<EpisodeFile>().RegisterModel("EpisodeFiles");
Mapper.Entity<QualityProfile>().RegisterModel("QualityProfiles"); Mapper.Entity<QualityProfile>().RegisterModel("QualityProfiles");

View File

@ -119,7 +119,7 @@
<script src="/Mixins/tablesorter.extensions.js"></script> <script src="/Mixins/tablesorter.extensions.js"></script>
<script src="/Mixins/spoon.js"></script> <script src="/Mixins/spoon.js"></script>
<script src="/Mixins/backbone.modelbinder.mixin.js"></script> <script src="/Mixins/backbone.modelbinder.mixin.js"></script>
<script src="/Mixins/backbone.Backgrid.mixin.js"></script> <script src="/Mixins/backbone.backgrid.mixin.js"></script>
<script src="/Mixins/handlebars.mixin.js"></script> <script src="/Mixins/handlebars.mixin.js"></script>
<script data-main="/app" src="/JsLibraries/require.js"></script> <script data-main="/app" src="/JsLibraries/require.js"></script>

View File

@ -354,4 +354,4 @@
}); });
}(jQuery, _, Backbone, Backgrid, lunr)); }(jQuery, _, Backbone, Backgrid));

View File

@ -77,7 +77,6 @@ define([
initialize: function () { initialize: function () {
this.missingCollection = new NzbDrone.Missing.Collection(); this.missingCollection = new NzbDrone.Missing.Collection();
this.missingCollection.fetch();
}, },
onShow: function () { onShow: function () {

View File

@ -30,15 +30,6 @@ Backgrid.NzbDroneHeaderCell = Backgrid.HeaderCell.extend({
var sortKey = this.collection.state.sortKey; var sortKey = this.collection.state.sortKey;
var sortDir = this._convertIntToDirection(this.collection.state.order); var sortDir = this._convertIntToDirection(this.collection.state.order);
if (sortKey === this.column.get('name')) {
this.$el.children('i').addClass(this._convertDirectionToIcon(sortDir));
this._direction = sortDir;
}
}
else if (this.collection.defaultSortKey) {
var sortKey = this.collection.defaultSortKey;
var sortDir = this._convertIntToDirection(this.collection.defaultSortDir);
if (sortKey === this.column.get('name')) { if (sortKey === this.column.get('name')) {
this.$el.children('i').addClass(this._convertDirectionToIcon(sortDir)); this.$el.children('i').addClass(this._convertDirectionToIcon(sortDir));
this._direction = sortDir; this._direction = sortDir;

View File

@ -1,14 +1,15 @@
"use strict"; "use strict";
define(['app', 'Series/SeriesModel'], function () { define(['app', 'Series/SeriesModel'], function () {
NzbDrone.Series.SeriesCollection = Backbone.Collection.extend({ NzbDrone.Series.SeriesCollection = Backbone.PageableCollection.extend({
url : NzbDrone.Constants.ApiRoot + '/series', url : NzbDrone.Constants.ApiRoot + '/series',
model: NzbDrone.Series.SeriesModel, model: NzbDrone.Series.SeriesModel,
defaultSortKey: 'title', mode: 'client',
defaultSortDir: '-1',
comparator: function (model) { state: {
return model.get(this.defaultSortKey); sortKey: "title",
order: -1,
pageSize: 1000000
} }
}); });
}); });