From 15acb9d20490c607ba128672304d2d31093d5210 Mon Sep 17 00:00:00 2001 From: Leonardo Galli Date: Sat, 25 Feb 2017 13:17:31 +0100 Subject: [PATCH] Search is now fixed too. --- src/UI/AddMovies/BulkImport/BulkImportSelectAllCell.js | 6 +++--- src/UI/AddMovies/SearchResultCollectionView.js | 4 ++-- src/UI/AddMovies/SearchResultView.js | 8 ++++---- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/UI/AddMovies/BulkImport/BulkImportSelectAllCell.js b/src/UI/AddMovies/BulkImport/BulkImportSelectAllCell.js index ea46703ee..1ef42e336 100644 --- a/src/UI/AddMovies/BulkImport/BulkImportSelectAllCell.js +++ b/src/UI/AddMovies/BulkImport/BulkImportSelectAllCell.js @@ -2,7 +2,7 @@ var $ = require('jquery'); var _ = require('underscore'); var SelectAllCell = require('../../Cells/SelectAllCell'); var Backgrid = require('backgrid'); -var MoviesCollection = require('../../Movies/MoviesCollection'); +var FullMovieCollection = require('../../Movies/FullMovieCollection'); module.exports = SelectAllCell.extend({ _originalRender : SelectAllCell.prototype.render, @@ -13,7 +13,7 @@ module.exports = SelectAllCell.extend({ this._originalInit.apply(this, arguments); var tmdbId = this.model.get('tmdbId'); - var existingMovie = MoviesCollection.where({ tmdbId: tmdbId }); + var existingMovie = FullMovieCollection.where({ tmdbId: tmdbId }); this.isDuplicate = existingMovie.length > 0 ? true : false; this.listenTo(this.model, 'change', this._refresh); @@ -40,4 +40,4 @@ module.exports = SelectAllCell.extend({ _refresh: function() { this.render(); } -}); \ No newline at end of file +}); diff --git a/src/UI/AddMovies/SearchResultCollectionView.js b/src/UI/AddMovies/SearchResultCollectionView.js index 42eca0944..4e68d63e2 100644 --- a/src/UI/AddMovies/SearchResultCollectionView.js +++ b/src/UI/AddMovies/SearchResultCollectionView.js @@ -1,6 +1,6 @@ var Marionette = require('marionette'); var SearchResultView = require('./SearchResultView'); -var MoviesCollection = require('../Movies/MoviesCollection'); +var FullMovieCollection = require('../Movies/FullMovieCollection'); var vent = require('vent'); module.exports = Marionette.CollectionView.extend({ @@ -48,7 +48,7 @@ module.exports = Marionette.CollectionView.extend({ appendHtml : function(collectionView, itemView, index) { var tmdbId = itemView.model.get('tmdbId'); - var existingMovies = MoviesCollection.where({ tmdbId: tmdbId }); + var existingMovies = FullMovieCollection.where({ tmdbId: tmdbId }); if(existingMovies.length > 0) { if(this.showExisting) { if (index < this.showing || index === 0) { diff --git a/src/UI/AddMovies/SearchResultView.js b/src/UI/AddMovies/SearchResultView.js index 76a683ee7..0b67a7e7a 100644 --- a/src/UI/AddMovies/SearchResultView.js +++ b/src/UI/AddMovies/SearchResultView.js @@ -6,7 +6,7 @@ var Marionette = require('marionette'); var Profiles = require('../Profile/ProfileCollection'); var RootFolders = require('./RootFolders/RootFolderCollection'); var RootFolderLayout = require('./RootFolders/RootFolderLayout'); -var MoviesCollection = require('../Movies/MoviesCollection'); +var FullMovieCollection = require('../Movies/FullMovieCollection'); var Config = require('../Config'); var Messenger = require('../Shared/Messenger'); var AsValidatedView = require('../Mixins/AsValidatedView'); @@ -94,7 +94,7 @@ var view = Marionette.ItemView.extend({ this.templateFunction = Marionette.TemplateCache.get('AddMovies/MinimumAvailabilityTooltipTemplate'); var content1 = this.templateFunction(); - + this.ui.minimumAvailabilityTooltip.popover({ content : content1, html :true, @@ -106,7 +106,7 @@ var view = Marionette.ItemView.extend({ }, _configureTemplateHelpers : function() { - var existingMovies = MoviesCollection.where({ tmdbId : this.model.get('tmdbId') }); + var existingMovies = FullMovieCollection.where({ tmdbId : this.model.get('tmdbId') }); if (existingMovies.length > 0) { this.templateHelpers.existing = existingMovies[0].toJSON(); } @@ -217,7 +217,7 @@ var view = Marionette.ItemView.extend({ }); promise.done(function() { - MoviesCollection.add(self.model); + FullMovieCollection.add(self.model); self.close();