From 6a3d886588e1c8fd4a345ca4750affbc41aeacca Mon Sep 17 00:00:00 2001
From: Mark McDowall <markus.mcd5@gmail.com>
Date: Thu, 2 May 2013 17:25:51 -0700
Subject: [PATCH] Missing doesn't double fetch

---
 NzbDrone.Core/Datastore/TableMapping.cs    |   5 ++++-
 NzbDrone.Core/Tv/EpisodeRepository.cs      | Bin 9468 -> 5818 bytes
 UI/Index.html                              |   2 +-
 UI/JsLibraries/backbone.backgrid.filter.js |   2 +-
 UI/Missing/MissingLayout.js                |   1 -
 UI/Mixins/backbone.Backgrid.mixin.js       |   9 ---------
 UI/Series/SeriesCollection.js              |  11 ++++++-----
 7 files changed, 12 insertions(+), 18 deletions(-)

diff --git a/NzbDrone.Core/Datastore/TableMapping.cs b/NzbDrone.Core/Datastore/TableMapping.cs
index 018ee4198..8762074ea 100644
--- a/NzbDrone.Core/Datastore/TableMapping.cs
+++ b/NzbDrone.Core/Datastore/TableMapping.cs
@@ -49,7 +49,10 @@ namespace NzbDrone.Core.Datastore
                   .HasOne(s => s.QualityProfile, s => s.QualityProfileId);
 
             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<QualityProfile>().RegisterModel("QualityProfiles");
diff --git a/NzbDrone.Core/Tv/EpisodeRepository.cs b/NzbDrone.Core/Tv/EpisodeRepository.cs
index 181bbd10552246b42e2194b37a05807adabbe0c6..e50f199d9fe4da0f150de4b9145798d458f24d41 100644
GIT binary patch
delta 191
zcmez4xl5P%{qFr6%y^j<v=k<r^I9pDB^D_pmlhSJ=9PqG=B6sxD!3$;q=J}wp(V+F
z`Q_G=lX>-pKmtlS$SOCl;62623>2Tt$fvn^9zQQ*cwlL2QKg=9eraBb2GArsg;YJ)
zg3RLllvKCOoK(*g1zTGM0|hlTpm=a<VsU<+UukYqYLS8+Ow=*62xPm0jV+2z8wFZf
HnRvMXkikCx

literal 9468
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

diff --git a/UI/Index.html b/UI/Index.html
index 76ac7c253..c5ed1b2cf 100644
--- a/UI/Index.html
+++ b/UI/Index.html
@@ -119,7 +119,7 @@
 <script src="/Mixins/tablesorter.extensions.js"></script>
 <script src="/Mixins/spoon.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 data-main="/app" src="/JsLibraries/require.js"></script>
diff --git a/UI/JsLibraries/backbone.backgrid.filter.js b/UI/JsLibraries/backbone.backgrid.filter.js
index c98c6658b..bc869bc57 100644
--- a/UI/JsLibraries/backbone.backgrid.filter.js
+++ b/UI/JsLibraries/backbone.backgrid.filter.js
@@ -354,4 +354,4 @@
 
   });
 
-}(jQuery, _, Backbone, Backgrid, lunr));
+}(jQuery, _, Backbone, Backgrid));
diff --git a/UI/Missing/MissingLayout.js b/UI/Missing/MissingLayout.js
index eff80f94a..dd5ff3d2c 100644
--- a/UI/Missing/MissingLayout.js
+++ b/UI/Missing/MissingLayout.js
@@ -77,7 +77,6 @@ define([
 
             initialize: function () {
                 this.missingCollection = new NzbDrone.Missing.Collection();
-                this.missingCollection.fetch();
             },
 
             onShow: function () {
diff --git a/UI/Mixins/backbone.Backgrid.mixin.js b/UI/Mixins/backbone.Backgrid.mixin.js
index 25343ea83..85eb1460e 100644
--- a/UI/Mixins/backbone.Backgrid.mixin.js
+++ b/UI/Mixins/backbone.Backgrid.mixin.js
@@ -30,15 +30,6 @@ Backgrid.NzbDroneHeaderCell = Backgrid.HeaderCell.extend({
                 var sortKey = this.collection.state.sortKey;
                 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')) {
                     this.$el.children('i').addClass(this._convertDirectionToIcon(sortDir));
                     this._direction = sortDir;
diff --git a/UI/Series/SeriesCollection.js b/UI/Series/SeriesCollection.js
index 89e3528e0..2d9c58723 100644
--- a/UI/Series/SeriesCollection.js
+++ b/UI/Series/SeriesCollection.js
@@ -1,14 +1,15 @@
 "use strict";
 define(['app', 'Series/SeriesModel'], function () {
-    NzbDrone.Series.SeriesCollection = Backbone.Collection.extend({
+    NzbDrone.Series.SeriesCollection = Backbone.PageableCollection.extend({
         url  : NzbDrone.Constants.ApiRoot + '/series',
         model: NzbDrone.Series.SeriesModel,
 
-        defaultSortKey: 'title',
-        defaultSortDir: '-1',
+        mode: 'client',
 
-        comparator: function (model) {
-            return model.get(this.defaultSortKey);
+        state: {
+            sortKey: "title",
+            order: -1,
+            pageSize: 1000000
         }
     });
 });